GEODE-6621: ensure that getBucketOwners result is modifiable (apache#…

…3438) A new HashSet is now created if we got back an empty set from adviseInitialized
b-xiang · Apr 10, 2019 · 4ad95a5 · 4ad95a5
1 parent c5e52ef
commit 4ad95a5
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
@@ -352,10 +352,12 @@ public ProxyBucketRegion initialize() {
   @Override
   public Set<InternalDistributedMember> getBucketOwners() {
     Set<InternalDistributedMember> s = this.advisor.adviseInitialized();
+    if (s.isEmpty()) {
+      // getBucketOwners needs to return a modifiable set.
+      // adviseInitialized returns an unmodifiable set when it is empty.
+      s = new HashSet<>();
+    }
     if (isHosting()) {
-      if (s.isEmpty()) {
-        s = new HashSet<>();
-      }
       s.add(this.partitionedRegion.getDistributionManager().getId());
     }
     return s;