[geode] branch feature/GEODE-7665 updated: GEODE-7894: Moving expiry tasks to AbstractRegion.

[nnag]

This is an automated email from the ASF dual-hosted git repository.

nnag pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-7665 by this 
push:
     new 780567a  GEODE-7894: Moving expiry tasks to AbstractRegion.
780567a is described below

commit 780567a758ad199a58ce61a32d5eef3273d277bf
Author: Nabarun Nag <n...@cs.wisc.edu>
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 e0ac35c..83072a3 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;