[java-metadata-aggregator COMMIT] /trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureVa...

[noreply at shibboleth.net]

Author: iay
Date: Sun Oct 13 13:10:10 2013
New Revision: 271

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=271&view=rev
Log:
Refactor to clarify.

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java?rev=271&r1=270&r2=271&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java Sun Oct 13 13:10:10 2013
@@ -295,16 +295,15 @@
             throw new ValidationException("Signature SignedInfo had invalid number of References: " + numReferences);
         }
 
-        Reference ref = null;
         try {
-            ref = signature.getSignedInfo().item(0);
+            final Reference ref = signature.getSignedInfo().item(0);
+            if (ref == null) {
+                throw new ValidationException("Signature Reference was null");
+            }
+            return ref;
         } catch (XMLSecurityException e) {
             throw new ValidationException("Apache XML Security exception obtaining Reference: " + e.getMessage());
         }
-        if (ref == null) {
-            throw new ValidationException("Signature Reference was null");
-        }
-        return ref;
     }
 
     /**