cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1352201 - /cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java
Date Wed, 20 Jun 2012 16:15:30 GMT
Author: coheigea
Date: Wed Jun 20 16:15:30 2012
New Revision: 1352201

URL: http://svn.apache.org/viewvc?rev=1352201&view=rev
Log:
Merged revisions 1352198 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1352198 | coheigea | 2012-06-20 17:12:56 +0100 (Wed, 20 Jun 2012) | 17 lines

  Merged revisions 1352180 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1352180 | coheigea | 2012-06-20 16:59:03 +0100 (Wed, 20 Jun 2012) | 2 lines

    Fixing EhCache so that it picks up individual configuration properly

  ........

  Conflicts:

  	rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
  	rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtil.java
  	rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java

........

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=1352201&r1=1352200&r2=1352201&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
Wed Jun 20 16:15:30 2012
@@ -50,7 +50,8 @@ public final class EHCacheManagerHolder 
                                                            CacheManager cacheManager) {
         CacheConfiguration cc = cacheManager.getConfiguration().getCacheConfigurations().get(key);
         if (cc == null && key.contains("-")) {
-            cc = cacheManager.getConfiguration().getCacheConfigurations().get(key.substring(0,
key.indexOf('-')));
+            cc = cacheManager.getConfiguration().getCacheConfigurations().get(
+                    key.substring(0, key.lastIndexOf('-') - 1));
         }
         if (cc == null) {
             cc = cacheManager.getConfiguration().getDefaultCacheConfiguration();



Mime
View raw message