cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1365131 - /cxf/branches/2.6.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java
Date Tue, 24 Jul 2012 15:32:32 GMT
Author: coheigea
Date: Tue Jul 24 15:32:32 2012
New Revision: 1365131

URL: http://svn.apache.org/viewvc?rev=1365131&view=rev
Log:
Merged revisions 1365130 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1365130 | coheigea | 2012-07-24 16:31:47 +0100 (Tue, 24 Jul 2012) | 2 lines

  Fixing build

........

Modified:
    cxf/branches/2.6.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java

Modified: cxf/branches/2.6.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java?rev=1365131&r1=1365130&r2=1365131&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java
Tue Jul 24 15:32:32 2012
@@ -33,13 +33,14 @@ import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.resource.ResourceManager;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.ws.security.WSSecurityException;
 import org.apache.ws.security.components.crypto.Crypto;
 import org.apache.ws.security.components.crypto.CryptoFactory;
 
 public class CryptoLoader {
     
+    private static final String CRYPTO_CACHE = "rs-security-xml-crypto.cache";
+    
     public Crypto getCrypto(Message message,
                             String cryptoKey, 
                             String propKey) 
@@ -93,10 +94,10 @@ public class CryptoLoader {
         EndpointInfo info = message.getExchange().get(Endpoint.class).getEndpointInfo();
         synchronized (info) {
             Map<Object, Crypto> o = 
-                CastUtils.cast((Map<?, ?>)info.getProperty(SecurityConstants.CRYPTO_CACHE));
+                CastUtils.cast((Map<?, ?>)info.getProperty(CRYPTO_CACHE));
             if (o == null) {
                 o = new ConcurrentHashMap<Object, Crypto>();
-                info.setProperty(SecurityConstants.CRYPTO_CACHE, o);
+                info.setProperty(CRYPTO_CACHE, o);
             }
             return o;
         }



Mime
View raw message