You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/12/02 17:53:42 UTC
svn commit: r1547104 -
/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
Author: coheigea
Date: Mon Dec 2 16:53:41 2013
New Revision: 1547104
URL: http://svn.apache.org/r1547104
Log:
Assert WS-SecurityPolicy Transport tokens.
Conflicts:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
Modified:
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java?rev=1547104&r1=1547103&r2=1547104&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java Mon Dec 2 16:53:41 2013
@@ -139,19 +139,21 @@ public class TransportBindingHandler ext
if (secToken == null) {
policyNotAsserted(transportToken, "No transport token id");
return;
- } else {
- policyAsserted(transportToken);
}
if (includeToken(transportToken.getInclusion())) {
Element el = secToken.getToken();
addEncryptedKeyElement(cloneElement(el));
}
}
+ policyAsserted(transportToken);
handleNonEndorsingSupportingTokens();
handleEndorsingSupportingTokens();
}
} else {
+ if (tbinding != null && tbinding.getTransportToken() != null) {
+ policyAsserted(tbinding.getTransportToken().getToken());
+ }
addSignatureConfirmation(null);
}
} catch (Exception e) {