[geode] branch feature/GEODE-8334 updated: the rvv should be cloned after locked

[zh...@apache.org]

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

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


The following commit(s) were added to refs/heads/feature/GEODE-8334 by this push:
     new 79516da  the rvv should be cloned after locked
79516da is described below

commit 79516dabe1175bc63211ed0170f10e4d982bae5d
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Tue Jul 7 10:56:17 2020 -0700

    the rvv should be cloned after locked
---
 .../src/main/java/org/apache/geode/internal/cache/BucketRegion.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
index c37e1a3..6219386 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
@@ -568,9 +568,6 @@ public class BucketRegion extends DistributedRegion implements Bucket {
 
     boolean enableRVV = useRVV && getConcurrencyChecksEnabled();
     RegionVersionVector rvv = null;
-    if (enableRVV) {
-      rvv = getVersionVector().getCloneForTransmission();
-    }
 
     // get rvvLock
     Set<InternalDistributedMember> participants =
@@ -582,6 +579,9 @@ public class BucketRegion extends DistributedRegion implements Bucket {
       if (!isLockedAlready) {
         obtainWriteLocksForClear(regionEvent, participants);
       }
+      if (enableRVV) {
+        rvv = getVersionVector().getCloneForTransmission();
+      }
       // no need to dominate my own rvv.
       // Clear is on going here, there won't be GII for this member
       clearRegionLocally(regionEvent, cacheWrite, null);