From commits-return-31323-archive-asf-public=cust-asf.ponee.io@geode.apache.org Wed Apr 10 15:05:42 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id EEF2F180626 for ; Wed, 10 Apr 2019 17:05:41 +0200 (CEST) Received: (qmail 86429 invoked by uid 500); 10 Apr 2019 15:05:40 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 86420 invoked by uid 99); 10 Apr 2019 15:05:40 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Apr 2019 15:05:40 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id E3B9380B7E; Wed, 10 Apr 2019 15:05:40 +0000 (UTC) Date: Wed, 10 Apr 2019 15:05:39 +0000 To: "commits@geode.apache.org" Subject: [geode] branch develop updated: GEODE-6621: ensure that getBucketOwners result is modifiable (#3438) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155490873834.17095.7652263251272142796@gitbox.apache.org> From: dschneider@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: geode X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: c5e52ef4f738b2f197c83deb290a3ad86ee0fbf3 X-Git-Newrev: 4ad95a5562c7c9f4a45dbade6a65db83505c11fe X-Git-Rev: 4ad95a5562c7c9f4a45dbade6a65db83505c11fe X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. dschneider pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new 4ad95a5 GEODE-6621: ensure that getBucketOwners result is modifiable (#3438) 4ad95a5 is described below commit 4ad95a5562c7c9f4a45dbade6a65db83505c11fe Author: Darrel Schneider AuthorDate: Wed Apr 10 08:05:25 2019 -0700 GEODE-6621: ensure that getBucketOwners result is modifiable (#3438) A new HashSet is now created if we got back an empty set from adviseInitialized --- .../java/org/apache/geode/internal/cache/ProxyBucketRegion.java | 8 +++++--- 1 file changed, 5 insertions(+), 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 index 40f99bb..2e18eec 100755 --- 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 class ProxyBucketRegion implements Bucket { @Override public Set getBucketOwners() { Set 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;