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

[coheigea]

Author: coheigea
Date: Wed Jun  6 15:44:34 2012
New Revision: 1346954

URL: http://svn.apache.org/viewvc?rev=1346954&view=rev
Log:
[CXF-4364] - Keep TokenStore and ReplayCache instances per-endpoint instead of 
per-bus

Conflicts:

        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java
        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java


Conflicts:

        
rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
        
systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/SecurityTestUtil.java
        
systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/SecurityTestUtil.java

Modified:
    
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java

Modified: 
cxf/branches/2.4.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.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1346954&r1=1346953&r2=1346954&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
 Wed Jun  6 15:44:34 2012
@@ -687,7 +687,11 @@ public class WSS4JInInterceptor extends 
                 }
                 if (replayCache == null) {
                     ReplayCacheFactory replayCacheFactory = 
ReplayCacheFactory.newInstance();
-                    replayCache = 
replayCacheFactory.newReplayCache(instanceKey, message);
+                    String cacheKey = instanceKey;
+                    if (info.getName() != null) {
+                        cacheKey += "-" + info.getName().toString().hashCode();
+                    }
+                    replayCache = replayCacheFactory.newReplayCache(cacheKey, 
message);
                     info.setProperty(instanceKey, replayCache);
                 }
                 return replayCache;