Author: coheigea Date: Tue Jun 12 16:22:55 2012 New Revision: 1349420 URL: http://svn.apache.org/viewvc?rev=1349420&view=rev Log: Merged revisions 1349416 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1349416 | coheigea | 2012-06-12 17:16:44 +0100 (Tue, 12 Jun 2012) | 15 lines Merged revisions 1349406 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1349406 | coheigea | 2012-06-12 16:58:09 +0100 (Tue, 12 Jun 2012) | 2 lines Enabling per-bus cache behaviour. ........ Conflicts: rt/ws/security/src/main/resources/cxf-ehcache.xml ........ Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java?rev=1349420&r1=1349419&r2=1349420&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java Tue Jun 12 16:22:55 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;
