svn commit: r1686381 - /webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java

[coheigea]

Author: coheigea
Date: Fri Jun 19 10:47:13 2015
New Revision: 1686381

URL: http://svn.apache.org/r1686381
Log:
Missing file from last commit

Modified:
    
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java

Modified: 
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java?rev=1686381&r1=1686380&r2=1686381&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
 Fri Jun 19 10:47:13 2015
@@ -76,11 +76,14 @@ public final class SAMLUtil {
             return getCredentialFromSubject(
                 samlAssertion.getSaml1(), keyInfoProcessor, sigCrypto, 
callbackHandler
             );
-        } else {
+        } else if (samlAssertion.getSaml2() != null) {
             return getCredentialFromSubject(
                 samlAssertion.getSaml2(), keyInfoProcessor, sigCrypto, 
callbackHandler
             );
         }
+        
+        throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, 
"empty",
+                                      new Object[] {"Cannot get credentials 
from an unknown SAML Assertion"});
     }
     
     /**