NPE when previous session + passive auth is used

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

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java b/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java
index f633e1c..31e9c09 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java
@@ -357,7 +357,7 @@ public class AuthenticationEngine extends HttpServlet {
                 AuthnContext.PREVIOUS_SESSION_AUTHN_CTX);
 
         AuthenticationMethodInformation authenticationMethod = null;
-        for (String possibleAuthnMethod : possibleLoginHandlers.keySet()) {
+        for (String possibleAuthnMethod : idpSession.getAuthenticationMethods().keySet()) {
             authenticationMethod = idpSession.getAuthenticationMethods().get(possibleAuthnMethod);
             if (authenticationMethod != null) {
                 break;