Author: coheigea Date: Fri May 17 14:33:19 2013 New Revision: 1483828 URL: http://svn.apache.org/r1483828 Log: Merged revisions 1483818 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1483818 | coheigea | 2013-05-17 15:17:56 +0100 (Fri, 17 May 2013) | 10 lines Merged revisions 1483811 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1483811 | coheigea | 2013-05-17 15:06:19 +0100 (Fri, 17 May 2013) | 2 lines [CXF-5018] - EHCache TimeToLive value overriden in EHCacheReplayCache ........ ........ Conflicts: rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java?rev=1483828&r1=1483827&r2=1483828&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheReplayCache.java Fri May 17 14:33:19 2013 @@ -57,6 +57,9 @@ public class EHCacheReplayCache implemen Ehcache newCache = new Cache(cc); cache = cacheManager.addCacheIfAbsent(newCache); + + // Set the TimeToLive value from the CacheConfiguration + ttl = cc.getTimeToLiveSeconds(); } /**
