You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2011/07/26 17:11:22 UTC
svn commit: r1151128 -
/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java
Author: coheigea
Date: Tue Jul 26 15:11:21 2011
New Revision: 1151128
URL: http://svn.apache.org/viewvc?rev=1151128&view=rev
Log:
[WSS-301] - Minor fix.
Modified:
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java
Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java?rev=1151128&r1=1151127&r2=1151128&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java Tue Jul 26 15:11:21 2011
@@ -116,16 +116,14 @@ public class WSSecSignatureBase extends
);
} else {
TransformParameterSpec transformSpec = null;
- if (wssConfig.isWsiBSPCompliant()) {
- Element toSignById = element;
- if (toSignById == null) {
- if (callbackLookup == null) {
- callbackLookup = new DOMCallbackLookup(doc);
- }
- toSignById = callbackLookup.getElement(idToSign, null, false);
- wsDocInfo.addTokenElement(toSignById, false);
+ if (element == null) {
+ if (callbackLookup == null) {
+ callbackLookup = new DOMCallbackLookup(doc);
}
- List<String> prefixes = getInclusivePrefixes(toSignById);
+ element = callbackLookup.getElement(idToSign, null, false);
+ }
+ if (wssConfig.isWsiBSPCompliant()) {
+ List<String> prefixes = getInclusivePrefixes(element);
transformSpec = new ExcC14NParameterSpec(prefixes);
}
transform =
@@ -166,7 +164,6 @@ public class WSSecSignatureBase extends
);
}
for (Element elementToSign : elementsToSign) {
- wsDocInfo.addTokenElement(elementToSign, false);
TransformParameterSpec transformSpec = null;
if (wssConfig.isWsiBSPCompliant()) {
List<String> prefixes = getInclusivePrefixes(elementToSign);
@@ -186,6 +183,7 @@ public class WSSecSignatureBase extends
null
);
referenceList.add(reference);
+ wsDocInfo.addTokenElement(elementToSign, false);
}
}
} catch (Exception ex) {