Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F039718D88 for ; Mon, 25 Jan 2016 17:45:09 +0000 (UTC) Received: (qmail 33224 invoked by uid 500); 25 Jan 2016 17:45:09 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 33194 invoked by uid 500); 25 Jan 2016 17:45:09 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 33185 invoked by uid 99); 25 Jan 2016 17:45:09 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jan 2016 17:45:09 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 56C58C1C57 for ; Mon, 25 Jan 2016 17:45:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.78 X-Spam-Level: * X-Spam-Status: No, score=1.78 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id eq48wWnOTUeG for ; Mon, 25 Jan 2016 17:45:08 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 77F7B45BFC for ; Mon, 25 Jan 2016 17:44:40 +0000 (UTC) Received: (qmail 29800 invoked by uid 99); 25 Jan 2016 17:44:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jan 2016 17:44:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DA073E00B2; Mon, 25 Jan 2016 17:44:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Mon, 25 Jan 2016 17:45:31 -0000 Message-Id: <8dc89b77ef92436f96c6ebf08fcf16a1@git.apache.org> In-Reply-To: <1134a85813de40eb80e08e624c6fd562@git.apache.org> References: <1134a85813de40eb80e08e624c6fd562@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [56/57] [abbrv] incubator-geode git commit: fixing a problem with the new constructor in NetView fixing a problem with the new constructor in NetView The new constructor used by unit tests was not setting the viewId correctly, causing a few tests to fail. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a92e041d Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a92e041d Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a92e041d Branch: refs/heads/feature/GEODE-819 Commit: a92e041d7e64774597c679296bf21390f9a6c908 Parents: df274cc Author: Bruce Schuchardt Authored: Mon Jan 25 08:55:19 2016 -0800 Committer: Bruce Schuchardt Committed: Mon Jan 25 08:56:41 2016 -0800 ---------------------------------------------------------------------- .../gemfire/distributed/internal/membership/NetView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a92e041d/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java index 5f68056..b0ddcc0 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java @@ -78,9 +78,9 @@ public class NetView implements DataSerializableFixedID { } public NetView(InternalDistributedMember creator, int viewId, List members) { - this.viewId = 0; + this.viewId = viewId; this.members = new ArrayList(members); - hashedMembers = new HashSet<>(members); + hashedMembers = new HashSet<>(this.members); shutdownMembers = new HashSet<>(); crashedMembers = Collections.emptySet(); this.creator = creator;