svn commit: r1533471 - /cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java

[dkulp]

Author: dkulp
Date: Fri Oct 18 14:51:15 2013
New Revision: 1533471

URL: http://svn.apache.org/r1533471
Log:
Merged revisions 1533470 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1533470 | dkulp | 2013-10-18 10:46:10 -0400 (Fri, 18 Oct 2013) | 2 lines

  After resetting the endpoint to the STS endpoint, recalc the Operation based 
on the soap action.

........

Modified:
    
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java

Modified: 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=1533471&r1=1533470&r2=1533471&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
 Fri Oct 18 14:51:15 2013
@@ -188,6 +188,8 @@ class SecureConversationInInterceptor ex
                 NegotiationUtils.recalcEffectivePolicy(message, ns, pol, 
                                                        new 
SecureConversationSTSInvoker(),
                                                        true);
+                //recalc based on new endpoint
+                SoapActionInInterceptor.getAndSetOperation(message, s);
             } else {
                 
message.getInterceptorChain().add(SecureConversationTokenFinderInterceptor.INSTANCE);
             }