You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by dk...@apache.org on 2011/06/01 22:43:05 UTC
svn commit: r1130298 -
/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
Author: dkulp
Date: Wed Jun 1 20:43:05 2011
New Revision: 1130298
URL: http://svn.apache.org/viewvc?rev=1130298&view=rev
Log:
Move throwing exception out of try block to avoid wrapping a
WSSecurityException into another WSSecurityException.
Modified:
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java?rev=1130298&r1=1130297&r2=1130298&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java Wed Jun 1 20:43:05 2011
@@ -350,35 +350,33 @@ public class SignatureProcessor implemen
boolean signatureOk = xmlSignature.validate(context);
if (signatureOk) {
return xmlSignature;
- } else {
- //
- // Log the exact signature error
- //
- if (LOG.isDebugEnabled()) {
- LOG.debug("XML Signature verification has failed");
- boolean signatureValidationCheck =
- xmlSignature.getSignatureValue().validate(context);
- LOG.debug("Signature Validation check: " + signatureValidationCheck);
- java.util.Iterator<?> referenceIterator =
- xmlSignature.getSignedInfo().getReferences().iterator();
- while (referenceIterator.hasNext()) {
- Reference reference = (Reference)referenceIterator.next();
- boolean referenceValidationCheck = reference.validate(context);
- String id = reference.getId();
- if (id == null) {
- id = reference.getURI();
- }
- LOG.debug("Reference " + id + " check: " + referenceValidationCheck);
+ }
+ //
+ // Log the exact signature error
+ //
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("XML Signature verification has failed");
+ boolean signatureValidationCheck =
+ xmlSignature.getSignatureValue().validate(context);
+ LOG.debug("Signature Validation check: " + signatureValidationCheck);
+ java.util.Iterator<?> referenceIterator =
+ xmlSignature.getSignedInfo().getReferences().iterator();
+ while (referenceIterator.hasNext()) {
+ Reference reference = (Reference)referenceIterator.next();
+ boolean referenceValidationCheck = reference.validate(context);
+ String id = reference.getId();
+ if (id == null) {
+ id = reference.getURI();
}
+ LOG.debug("Reference " + id + " check: " + referenceValidationCheck);
}
-
- throw new WSSecurityException(WSSecurityException.FAILED_CHECK);
}
} catch (Exception ex) {
throw new WSSecurityException(
WSSecurityException.FAILED_CHECK, null, null, ex
);
}
+ throw new WSSecurityException(WSSecurityException.FAILED_CHECK);
}