svn commit: r834530 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java

[dkulp]

Author: dkulp
Date: Tue Nov 10 16:24:33 2009
New Revision: 834530

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

........
  r834528 | dkulp | 2009-11-10 11:21:35 -0500 (Tue, 10 Nov 2009) | 2 lines
  
  [CXF-2525] Fix issue in TokenStoreCallback with it using a possible null
  token
........

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/wss4j/WSS4JInInterceptor.java

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/wss4j/WSS4JInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=834530&r1=834529&r2=834530&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
 Tue Nov 10 16:24:33 2009
@@ -413,7 +413,7 @@
                     SecurityToken tok = store.getToken(id);
                     if (tok != null) {
                         pc.setKey(tok.getSecret());
-                        pc.setCustomToken(tok.getAttachedReference());
+                        pc.setCustomToken(tok.getToken());
                         return;
                     }
                 }