and revert

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

diff --git a/resources/conf/internal.xml b/resources/conf/internal.xml
index a294e02..dba227b 100644 (file)
--- a/resources/conf/internal.xml
+++ b/resources/conf/internal.xml
@@ -245,7 +245,7 @@
             <map>
                 <entry>
                     <key>
-                        <value>sessionManager</value>
+                        <value>shibboleth.SessionManager</value>
                     </key>
                     <ref bean="shibboleth.SessionManager" />
                 </entry>

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java b/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java
index 556eedc..9763b1e 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java
@@ -79,8 +79,8 @@ public class AuthenticationEngine extends HttpServlet {
         handlerManager = (IdPProfileHandlerManager) getServletContext().getAttribute(handlerManagerId);
 
         String sessionManagerId = config.getInitParameter("sessionManagedId");
-        if (DatatypeHelper.isEmpty(handlerManagerId)) {
-            sessionManagerId = "sessionManager";
+        if (DatatypeHelper.isEmpty(sessionManagerId)) {
+            sessionManagerId = "shibboleth.SessionManager";
         }
 
         sessionManager = (SessionManager<Session>) getServletContext().getAttribute(sessionManagerId);