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 2013/10/24 20:09:06 UTC
svn commit: r1535468 -
/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
Author: dkulp
Date: Thu Oct 24 18:09:05 2013
New Revision: 1535468
URL: http://svn.apache.org/r1535468
Log:
Merged revisions 1533471 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1533471 | dkulp | 2013-10-18 10:51:15 -0400 (Fri, 18 Oct 2013) | 10 lines
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.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
Modified: cxf/branches/2.6.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.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=1535468&r1=1535467&r2=1535468&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java Thu Oct 24 18:09:05 2013
@@ -187,6 +187,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);
}