You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/02/19 19:45:32 UTC
svn commit: r745962 -
/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
Author: dkulp
Date: Thu Feb 19 18:45:31 2009
New Revision: 745962
URL: http://svn.apache.org/viewvc?rev=745962&view=rev
Log:
[CXF-2052] Get a couple more SecureConv tests working. Patch from Eamonn Dwyer applied.
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java?rev=745962&r1=745961&r2=745962&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java Thu Feb 19 18:45:31 2009
@@ -141,7 +141,6 @@
}
-
private void doEncryptBeforeSign() throws SOAPException,
WSSecurityException, ConversationException {
@@ -162,7 +161,7 @@
if (encryptionToken instanceof IssuedToken) {
tok = getSecurityToken();
} else if (encryptionToken instanceof SecureConversationToken) {
- //REVISIT - SecureConversation
+ tok = getSecurityToken();
} else if (encryptionToken instanceof X509Token) {
if (isRequestor()) {
tokenId = setupEncryptedKey(encryptionWrapper, encryptionToken);