This is an automated email from the ASF dual-hosted git repository. jinmeiliao pushed a commit to branch feature/GEODE-7665 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 16814730977822a903521e2bc89e19206c6d9698 Author: Nabarun Nag <[email protected]> AuthorDate: Mon May 11 13:44:56 2020 -0700 GEODE-7894: Moving expiry tasks to AbstractRegion. --- .../src/main/java/org/apache/geode/internal/cache/AbstractRegion.java | 1 + .../src/main/java/org/apache/geode/internal/cache/LocalRegion.java | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java index 0364e17..ca75bf2 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java @@ -113,6 +113,7 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato private static final Logger logger = LogService.getLogger(); private final ReentrantReadWriteLock readWriteLockForCacheLoader = new ReentrantReadWriteLock(); private final ReentrantReadWriteLock readWriteLockForCacheWriter = new ReentrantReadWriteLock(); + @VisibleForTesting protected final ConcurrentHashMap<RegionEntry, EntryExpiryTask> entryExpiryTasks = new ConcurrentHashMap<>(); /** diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java index dcf35fa..f43fa24 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java @@ -325,9 +325,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory, */ private int txRefCount; - @VisibleForTesting - final ConcurrentHashMap<RegionEntry, EntryExpiryTask> entryExpiryTasks = - new ConcurrentHashMap<>(); private volatile boolean regionInvalid;
