Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Chris Beams
2012-01-10 16:53:26 +01:00
parent 18b67eed29 66df039b03
commit 7636913710
14 changed files with 163 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java vendored
View File

@@ -39,7 +39,15 @@ public class EhCacheCacheManager extends AbstractCacheManager {
/**
* Set the backing EhCache {@link net.sf.ehcache.CacheManager}.
* Returns the backing Ehcache {@link net.sf.ehcache.CacheManager}.
* @return
*/
public net.sf.ehcache.CacheManager getCacheManager() {
return cacheManager;
}
/**
* Sets the backing EhCache {@link net.sf.ehcache.CacheManager}.
*/
public void setCacheManager(net.sf.ehcache.CacheManager cacheManager) {
this.cacheManager = cacheManager;
@@ -75,5 +83,4 @@ public class EhCacheCacheManager extends AbstractCacheManager {
}
return cache;
}
}
}