[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: putmanb
Date: Fri Jan 15 23:29:37 2016
New Revision: 3220

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3220&view=rev
Log:
SIDP-623: NPE after error relating to SAML 2 artifact resolution

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.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=3220&r1=3219&r2=3220&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt	(original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt	Fri Jan 15 23:29:37 2016
@@ -7,6 +7,7 @@
 Changes in Release 2.4.5
 =============================================
 [SIDP-617] - Prevent No-login-context errors due to duplicate logins
+[SIDP-623] - NPE after error relating to SAML 2 artifact resolution
 
 Changes in Release 2.4.4
 =============================================

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java?rev=3220&r1=3219&r2=3220&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java	(original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java	Fri Jan 15 23:29:37 2016
@@ -115,6 +115,7 @@
                 log.error(msg);
                 requestContext
                         .setFailureStatus(buildStatus(StatusCode.SUCCESS_URI, StatusCode.REQUEST_DENIED_URI, msg));
+                return;
             }
 
             if (!artifactEntry.getIssuerId().equals(requestContext.getLocalEntityId())) {