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 2011/08/26 21:57:53 UTC
svn commit: r1162225 - in /cxf/branches/2.4.x-fixes: ./
rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
Author: dkulp
Date: Fri Aug 26 19:57:52 2011
New Revision: 1162225
URL: http://svn.apache.org/viewvc?rev=1162225&view=rev
Log:
Merged revisions 1161284 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1161284 | dkulp | 2011-08-24 17:27:02 -0400 (Wed, 24 Aug 2011) | 1 line
Minor optimization
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
Propchange: cxf/branches/2.4.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.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.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=1162225&r1=1162224&r2=1162225&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java Fri Aug 26 19:57:52 2011
@@ -217,14 +217,14 @@ class SecureConversationInInterceptor ex
String namespace,
Policy policy) {
Exchange ex = message.getExchange();
- Bus bus = ex.get(Bus.class);
+ Bus bus = ex.getBus();
PolicyEngine pe = bus.getExtension(PolicyEngine.class);
if (null == pe) {
return;
}
Destination destination = ex.getDestination();
try {
- Endpoint endpoint = message.getExchange().get(Endpoint.class);
+ Endpoint endpoint = message.getExchange().getEndpoint();
TokenStore store = (TokenStore)message.getContextualProperty(TokenStore.class.getName());
if (store == null) {