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 e17b69a11526b56ba48ecfdfe1eabe2f94188e06 Author: Thomas Vandahl <t...@apache.org> AuthorDate: Thu Dec 23 11:56:06 2021 +0100 Better encapsulation --- .../java/org/apache/commons/jcs3/engine/control/CompositeCache.java | 5 +++++ .../commons/jcs3/engine/control/CompositeCacheConfigurator.java | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java index 5fd100a..7696323 100644 --- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java +++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java @@ -185,6 +185,11 @@ public class CompositeCache<K, V> new ShrinkerThread<>(this), 0, cacheAttr.getShrinkerIntervalSeconds(), TimeUnit.SECONDS); } + + if (memCache instanceof IRequireScheduler) + { + ((IRequireScheduler) memCache).setScheduledExecutorService(scheduledExecutor); + } } /** diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java index cd850ce..99b6d8e 100644 --- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java +++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java @@ -213,12 +213,6 @@ public class CompositeCacheConfigurator // Inject element event queue cache.setElementEventQueue(ccm.getElementEventQueue()); - if (cache.getMemoryCache() instanceof IRequireScheduler) - { - ((IRequireScheduler)cache.getMemoryCache()).setScheduledExecutorService( - ccm.getScheduledExecutorService()); - } - if (auxiliaries != null) { // Next, create the auxiliaries for the new cache