[java-opensaml COMMIT] in /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml: saml1/binding/artifact/SAML1Artif...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed May 18 16:47:05 2016
New Revision: 4455

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4455&view=rev
Log:
OSJ-162: SAML artifact builder factories have NPE on invalid artifact type 

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactBuilderFactory.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/binding/artifact/SAML2ArtifactBuilderFactory.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactBuilderFactory.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactBuilderFactory.java?rev=4455&r1=4454&r2=4455&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactBuilderFactory.java	(original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactBuilderFactory.java	Wed May 18 16:47:05 2016
@@ -85,6 +85,9 @@
         type[1] = artifact[1];
 
         SAML1ArtifactBuilder<?> artifactBuilder = getArtifactBuilder(type);
+        if (artifactBuilder == null) {
+            throw new IllegalArgumentException("Saw unsupported artifact type: " + new String(type));
+        }
         return artifactBuilder.buildArtifact(artifact);
     }
 }

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/binding/artifact/SAML2ArtifactBuilderFactory.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/binding/artifact/SAML2ArtifactBuilderFactory.java?rev=4455&r1=4454&r2=4455&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/binding/artifact/SAML2ArtifactBuilderFactory.java	(original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/binding/artifact/SAML2ArtifactBuilderFactory.java	Wed May 18 16:47:05 2016
@@ -84,6 +84,9 @@
         type[1] = artifact[1];
 
         SAML2ArtifactBuilder<?> artifactBuilder = getArtifactBuilder(type);
+        if (artifactBuilder == null) {
+            throw new IllegalArgumentException("Saw unsupported artifact type: " + new String(type));
+        }
         return artifactBuilder.buildArtifact(artifact);
     }
 }