[geode] branch feature/GEODE-7682 updated: fix-3

[zhouxj]

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

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


The following commit(s) were added to refs/heads/feature/GEODE-7682 by this 
push:
     new 0143c69  fix-3
0143c69 is described below

commit 0143c699ad7f18c74b1ebc22b4f62ef6a4bd3c67
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Tue Feb 25 17:27:28 2020 -0800

    fix-3
---
 .../main/java/org/apache/geode/internal/cache/PartitionedRegion.java | 5 +++--
 .../org/apache/geode/internal/cache/partitioned/ClearPRMessage.java  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index ded548f..2f30cf8 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -2268,15 +2268,16 @@ public class PartitionedRegion extends LocalRegion
         continue;
       } // pick target
 
+      boolean result = false;
       try {
         final boolean isLocal = (this.localMaxMemory > 0) && 
currentTarget.equals(getMyId());
         if (isLocal) {
-          clearPRMessage.doLocalClear(this, bucketId);
+          result = clearPRMessage.doLocalClear(this, bucketId);
         } else {
           ClearPRMessage.ClearResponse response = 
clearPRMessage.send(currentTarget, this);
           if (response != null) {
             this.prStats.incPartitionMessagesSent();
-            boolean result = response.waitForResult();
+            result = response.waitForResult();
           }
         }
       } catch (ForceReattemptException prce) {
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ClearPRMessage.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ClearPRMessage.java
index ce7ce36..fd1c383 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ClearPRMessage.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ClearPRMessage.java
@@ -169,7 +169,7 @@ public class ClearPRMessage extends 
PartitionMessageWithDirectReply {
   protected boolean operateOnPartitionedRegion(ClusterDistributionManager 
distributionManager,
       PartitionedRegion region, long startTime) {
     try {
-      result = doLocalClear(region, bucketId);
+      doLocalClear(region, bucketId);
     } catch (ForceReattemptException ex) {
       sendReply(getSender(), getProcessorId(), distributionManager, new 
ReplyException(ex), region,
           startTime);
@@ -203,6 +203,7 @@ public class ClearPRMessage extends 
PartitionMessageWithDirectReply {
       bucketRegion.doUnlockForPrimary();
     }
 
+    // TODO this method can change to void
     return true;
   }