cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1349406 - in /cxf/trunk/rt/ws/security/src/main: java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java resources/cxf-ehcache.xml
Date Tue, 12 Jun 2012 15:58:09 GMT
Author: coheigea
Date: Tue Jun 12 15:58:09 2012
New Revision: 1349406

URL: http://svn.apache.org/viewvc?rev=1349406&view=rev
Log:
Enabling per-bus cache behaviour.

Modified:
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java
    cxf/trunk/rt/ws/security/src/main/resources/cxf-ehcache.xml

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java?rev=1349406&r1=1349405&r2=1349406&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java
Tue Jun 12 15:58:09 2012
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.ws.security.cache;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.concurrent.ConcurrentHashMap;
@@ -114,15 +115,13 @@ public final class EHCacheManagerHolder 
                 perBus = "true";
             }
             if (Boolean.parseBoolean(perBus)) {
-                conf.setName(bus.getId());
-                if ("java.io.tmpdir".equals(conf.getDiskStoreConfiguration().getOriginalPath()))
{
-                    
-                    String path = conf.getDiskStoreConfiguration().getPath() + File.separator
-                        + bus.getId();
-                    conf.getDiskStoreConfiguration().setPath(path);
-                }
-            }
             */
+            conf.setName(bus.getId());
+            if ("java.io.tmpdir".equals(conf.getDiskStoreConfiguration().getOriginalPath()))
{
+                String path = conf.getDiskStoreConfiguration().getPath() + File.separator
+                    + bus.getId();
+                conf.getDiskStoreConfiguration().setPath(path);
+            }
             return CacheManager.create(conf);
         } catch (Throwable t) {
             return null;

Modified: cxf/trunk/rt/ws/security/src/main/resources/cxf-ehcache.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/resources/cxf-ehcache.xml?rev=1349406&r1=1349405&r2=1349406&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/resources/cxf-ehcache.xml (original)
+++ cxf/trunk/rt/ws/security/src/main/resources/cxf-ehcache.xml Tue Jun 12 15:58:09 2012
@@ -15,7 +15,7 @@
             />
             
      <!--  
-         Security Tokens are now writable to Disk so use a memory only
+         Security Tokens are not writable to Disk so use a memory only
          cache with a bit larger maxEntriesLocalHeap.  However, this
          cache is per-endpoint so not "too large" to not consume the
          entire heap.      



Mime
View raw message