This is an automated email from the ASF dual-hosted git repository. tv pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit 8811ee50a25cba528a0971f5ac0b9995238f71a6 Author: Thomas Vandahl <[email protected]> AuthorDate: Mon Feb 9 17:40:02 2026 +0100 Simplify call hierarchy --- .../engine/control/CompositeCacheConfigurator.java | 23 ++++++---------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheConfigurator.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheConfigurator.java index e2b8399e..7bc067cc 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheConfigurator.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheConfigurator.java @@ -340,21 +340,6 @@ public class CompositeCacheConfigurator return keyMatcher; } - /** - * Create cache region. - * - * @param props Configuration properties - * @param ccm Cache hub - * @param regName Name of the cache region - * @param auxiliaries Comma separated list of auxiliaries - * @return CompositeCache - */ - protected <K, V> CompositeCache<K, V> parseRegion( - final Properties props, final CompositeCacheManager ccm, final String regName, final String auxiliaries ) - { - return parseRegion( props, ccm, regName, auxiliaries, null, REGION_PREFIX ); - } - /** * Gets all the properties for a region and configure its cache. * <p> @@ -475,7 +460,9 @@ public class CompositeCacheConfigurator final ICache<?, ?> cache; synchronized ( regionName ) { - cache = parseRegion( props, ccm, regionName, auxiliaries ); + ICompositeCacheAttributes cattr = parseCompositeCacheAttributes(props, regionName, + ccm.getDefaultCacheAttributes()); + cache = parseRegion(props, ccm, regionName, auxiliaries, cattr); } ccm.addCache( regionName, cache ); } @@ -501,7 +488,9 @@ public class CompositeCacheConfigurator final ICache<?, ?> cache; synchronized ( regionName ) { - cache = parseRegion( props, ccm, regionName, auxiliaries, null, SYSTEM_REGION_PREFIX ); + ICompositeCacheAttributes cattr = parseCompositeCacheAttributes(props, regionName, + ccm.getDefaultCacheAttributes(), SYSTEM_REGION_PREFIX); + cache = parseRegion( props, ccm, regionName, auxiliaries, cattr, SYSTEM_REGION_PREFIX ); } ccm.addCache( regionName, cache ); }
