cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r932414 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
Date Fri, 09 Apr 2010 13:49:37 GMT
Author: dkulp
Date: Fri Apr  9 13:49:37 2010
New Revision: 932414

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

........
  r932408 | dkulp | 2010-04-09 09:38:28 -0400 (Fri, 09 Apr 2010) | 2 lines
  
  On server side, we already have the transport ID, use it instead of
  trying to find a conduit to match the URL.
........

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/policy/interceptors/SecureConversationInInterceptor.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr  9 13:49:37 2010
@@ -1 +1 @@
-/cxf/trunk:931228,931629,931644,931758,931765
+/cxf/trunk:931228,931629,931644,931758,931765,932408

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/policy/interceptors/SecureConversationInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=932414&r1=932413&r2=932414&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
Fri Apr  9 13:49:37 2010
@@ -220,6 +220,7 @@ class SecureConversationInInterceptor ex
         Destination destination = ex.getDestination();
         try {
             Endpoint endpoint = message.getExchange().get(Endpoint.class);
+            
             TokenStore store = (TokenStore)message.getContextualProperty(TokenStore.class.getName());
             if (store == null) {
                 store = new MemoryTokenStore();
@@ -227,7 +228,7 @@ class SecureConversationInInterceptor ex
             }
             endpoint = STSUtils.createSTSEndpoint(bus, 
                                                   namespace,
-                                                  null,
+                                                  endpoint.getEndpointInfo().getTransportId(),
                                                   destination.getAddress().getAddress().getValue(),
                                                   message.getVersion().getBindingId(), 
                                                   policy,



Mime
View raw message