svn commit: r830560 - /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java

[dkulp]

Author: dkulp
Date: Wed Oct 28 14:30:13 2009
New Revision: 830560

URL: http://svn.apache.org/viewvc?rev=830560&view=rev
Log:
Fix ws-sc cancel operation I broke last week.

Modified:
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=830560&r1=830559&r2=830560&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 Wed Oct 28 14:30:13 2009
@@ -546,11 +546,6 @@
     public void cancelSecurityToken(SecurityToken token) throws Exception {
         createClient();
 
-        if (isSecureConv) {
-            client.getRequestContext().put(SoapBindingConstants.SOAP_ACTION,
-                                           namespace + "/RST/SCT/Cancel");
-        }
-
         if (addressingNamespace == null) {
             addressingNamespace = "http://www.w3.org/2005/08/addressing";;
         }
@@ -590,8 +585,13 @@
         client.getRequestContext().put(SecurityConstants.TOKEN, token);
         BindingOperationInfo boi = findOperation("/RST/Cancel");
         
-        client.getRequestContext().put(SoapBindingConstants.SOAP_ACTION, 
-                                       namespace + "/RST/Cancel");
+        if (isSecureConv) {
+            client.getRequestContext().put(SoapBindingConstants.SOAP_ACTION,
+                                           namespace + "/RST/SCT/Cancel");
+        } else {
+            client.getRequestContext().put(SoapBindingConstants.SOAP_ACTION, 
+                                           namespace + "/RST/Cancel");         
   
+        }
 
 
         W3CDOMStreamWriter writer = new W3CDOMStreamWriter();