[java-xmltooling COMMIT] /branches/REL_1/src/main/java/org/opensaml/xml/security/x509/BasicX509CredentialNameEvaluato...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 27 16:54:42 2012
New Revision: 767

URL: http://svn.shibboleth.net/view/java-xmltooling?rev=767&view=rev
Log:
Backport a null check.

Modified:
    branches/REL_1/src/main/java/org/opensaml/xml/security/x509/BasicX509CredentialNameEvaluator.java

Modified: branches/REL_1/src/main/java/org/opensaml/xml/security/x509/BasicX509CredentialNameEvaluator.java
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/src/main/java/org/opensaml/xml/security/x509/BasicX509CredentialNameEvaluator.java?rev=767&r1=766&r2=767&view=diff
==============================================================================
--- branches/REL_1/src/main/java/org/opensaml/xml/security/x509/BasicX509CredentialNameEvaluator.java (original)
+++ branches/REL_1/src/main/java/org/opensaml/xml/security/x509/BasicX509CredentialNameEvaluator.java Thu Dec 27 16:54:42 2012
@@ -357,13 +357,14 @@
         Integer[] nameTypes = new Integer[subjectAltNameTypes.size()];
         subjectAltNameTypes.toArray(nameTypes);
         List altNames = X509Util.getAltNames(certificate, nameTypes);
-
-        log.debug("Extracted subject alt names from certificate: {}", altNames);
-
-        for (Object altName : altNames) {
-            if (trustedNames.contains(altName)) {
-                log.debug("Matched subject alt name to trusted names: {}", altName.toString());
-                return true;
+        if (altNames != null) {
+            log.debug("Extracted subject alt names from certificate: {}", altNames);
+    
+            for (Object altName : altNames) {
+                if (trustedNames.contains(altName)) {
+                    log.debug("Matched subject alt name to trusted names: {}", altName.toString());
+                    return true;
+                }
             }
         }
         return false;