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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Nov  2 00:54:00 2012
New Revision: 759

URL: http://svn.shibboleth.net/view/java-xmltooling?rev=759&view=rev
Log:
Fix dead code warning.

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

Modified: branches/REL_1/src/main/java/org/opensaml/xml/security/x509/X509Util.java
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/src/main/java/org/opensaml/xml/security/x509/X509Util.java?rev=759&r1=758&r2=759&view=diff
==============================================================================
--- branches/REL_1/src/main/java/org/opensaml/xml/security/x509/X509Util.java (original)
+++ branches/REL_1/src/main/java/org/opensaml/xml/security/x509/X509Util.java Fri Nov  2 00:54:00 2012
@@ -270,14 +270,9 @@
         SubjectKeyIdentifier ski = null;
         try {
             ski = new SubjectKeyIdentifierStructure(derValue);
+            return ski.getKeyIdentifier();
         } catch (IOException e) {
             log.error("Unable to extract subject key identifier from certificate: ASN.1 parsing failed: " + e);
-            return null;
-        }
-
-        if (ski != null) {
-            return ski.getKeyIdentifier();
-        } else {
             return null;
         }
     }