https://bugs.internet2.edu/jira/browse/SIDP-359

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2908 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt
index c621d8a..f6079bd 100644 (file)
--- a/doc/RELEASE-NOTES.txt
+++ b/doc/RELEASE-NOTES.txt
@@ -2,6 +2,7 @@ Changes in Release 2.2.0
 =============================================
 [SIDP-362] - Only log exception message without stack trace for expired SAML messages
 [SIDP-360] - Session isn't being set within the attribute request context during a SAML1 attribute query
+[SIDP-359] - HttpServletHelper.getRelyingPartyConfirmationManager misnamed
 
 Changes in Release 2.1.5
 =============================================

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/idp/util/HttpServletHelper.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/util/HttpServletHelper.java
index 42a3598..df1640f 100644 (file)
--- a/src/main/java/edu/internet2/middleware/shibboleth/idp/util/HttpServletHelper.java
+++ b/src/main/java/edu/internet2/middleware/shibboleth/idp/util/HttpServletHelper.java
@@ -354,6 +354,33 @@ public class HttpServletHelper {
      * 
      * @return the service or null if there is no such service bound to the context
      */
+    public static RelyingPartyConfigurationManager getRelyingPartyConfigurationManager(ServletContext context) {
+        return getRelyingPartyConfigurationManager(context, getContextParam(context, RP_CONFIG_MNGR_SID_CTX_PARAM,
+                DEFAULT_RP_CONFIG_MNGR_SID));
+    }
+    
+    /**
+     * Gets the {@link RelyingPartyConfigurationManager} bound to the Servlet context.
+     * 
+     * @param context the Servlet context
+     * @param serviceId the ID under which the service bound
+     * 
+     * @return the service or null if there is no such service bound to the context
+     */
+    public static RelyingPartyConfigurationManager getRelyingPartyConfigurationManager(ServletContext context,
+            String serviceId) {
+        return (RelyingPartyConfigurationManager) context.getAttribute(serviceId);
+    }
+    
+    /**
+     * Gets the {@link RelyingPartyConfigurationManager} service bound to the Servlet context.
+     * 
+     * @param context the Servlet context
+     * 
+     * @return the service or null if there is no such service bound to the context
+     * 
+     * @deprecated use {@link #getRelyingPartyConfigurationManager(ServletContext)}
+     */
     public static RelyingPartyConfigurationManager getRelyingPartyConfirmationManager(ServletContext context) {
         return getRelyingPartyConfirmationManager(context, getContextParam(context, RP_CONFIG_MNGR_SID_CTX_PARAM,
                 DEFAULT_RP_CONFIG_MNGR_SID));
@@ -366,6 +393,8 @@ public class HttpServletHelper {
      * @param serviceId the ID under which the service bound
      * 
      * @return the service or null if there is no such service bound to the context
+     * 
+     * @deprecated use {@link #getRelyingPartyConfigurationManager(ServletContext, String)
      */
     public static RelyingPartyConfigurationManager getRelyingPartyConfirmationManager(ServletContext context,
             String serviceId) {