svn commit: r830561 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java

[dkulp]

Author: dkulp
Date: Wed Oct 28 14:33:28 2009
New Revision: 830561

URL: http://svn.apache.org/viewvc?rev=830561&view=rev
Log:
Merged revisions 830560 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r830560 | dkulp | 2009-10-28 10:30:13 -0400 (Wed, 28 Oct 2009) | 1 line
  
  Fix ws-sc cancel operation I broke last week.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=830561&r1=830560&r2=830561&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 Wed Oct 28 14:33:28 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();