svn commit: r1352198 - /cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java

[coheigea]

Author: coheigea
Date: Wed Jun 20 16:12:56 2012
New Revision: 1352198

URL: http://svn.apache.org/viewvc?rev=1352198&view=rev
Log:
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.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java

Modified: 
cxf/branches/2.5.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.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java?rev=1352198&r1=1352197&r2=1352198&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java
 Wed Jun 20 16:12:56 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();