[java-shib-idp2 COMMIT] /branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEng...

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Oct 10 20:28:18 2011
New Revision: 3077

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3077&view=rev
Log:
Deal with another possible other cause of NPE seen in SIDP-508

Modified:
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java

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=3077&r1=3076&r2=3077&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 Mon Oct 10 20:28:18 2011
@@ -163,11 +163,13 @@
         if (loginContext == null) {
             LOG.warn("No login context available, unable to return to profile handler");
             forwardRequest("/error.jsp", httpRequest, httpResponse);
+            return;
         }
         
         if (loginContext.getProfileHandlerURL() == null) {
             LOG.warn("Login context did not contain a profile handler path, unable to return to profile handler");
             forwardRequest("/error.jsp", httpRequest, httpResponse);
+            return;
         }
 
         String profileUrl = HttpServletHelper.getContextRelativeUrl(httpRequest, loginContext.getProfileHandlerURL())