[java-shib-idp2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth/i...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Nov  9 00:14:33 2011
New Revision: 3089

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3089&view=rev
Log:
SIDP-529: NPE with isPassive

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=3089&r1=3088&r2=3089&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Wed Nov  9 00:14:33 2011
@@ -1,3 +1,7 @@
+Changes in Release 2.3.5
+=============================================
+[SIDP-529] - NPE with isPassive
+
 Changes in Release 2.3.4
 =============================================
 [SIDP-508] - NullPointerException in AuthenticationEngine

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java?rev=3089&r1=3088&r2=3089&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java Wed Nov  9 00:14:33 2011
@@ -540,6 +540,7 @@
             validateSuccessfulAuthentication(loginContext, httpRequest, actualAuthnMethod);
             if(loginContext.getAuthenticationFailure() != null){
                 returnToProfileHandler(httpRequest, httpResponse);
+                return;
             }
 
             // Check for an overridden authn instant.