cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r828049 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
Date Wed, 21 Oct 2009 15:32:44 GMT
Author: dkulp
Date: Wed Oct 21 15:32:44 2009
New Revision: 828049

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

........
  r828046 | dkulp | 2009-10-21 11:28:59 -0400 (Wed, 21 Oct 2009) | 2 lines
  
  [CXF-2487] Fix the id that is used to lookup the SecConv token
  Patch from Colm applied
........

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 = /cxf/trunk:828046

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=828049&r1=828048&r2=828049&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
Wed Oct 21 15:32:44 2009
@@ -462,7 +462,7 @@
                         SecurityContextToken tok
                             = (SecurityContextToken)wser
                                 .get(WSSecurityEngineResult.TAG_SECURITY_CONTEXT_TOKEN);
-                        message.getExchange().put(SecurityConstants.TOKEN_ID, tok.getID());
+                        message.getExchange().put(SecurityConstants.TOKEN_ID, tok.getIdentifier());
                         found = true;
                     }
                 }



Mime
View raw message