Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 129CB2009A8 for ; Tue, 17 May 2016 17:57:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1132D160A26; Tue, 17 May 2016 15:57:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 65AC81607A8 for ; Tue, 17 May 2016 17:57:35 +0200 (CEST) Received: (qmail 17702 invoked by uid 500); 17 May 2016 15:57:34 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 17693 invoked by uid 99); 17 May 2016 15:57:34 -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; Tue, 17 May 2016 15:57:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7A11BDFB93; Tue, 17 May 2016 15:57:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.apache.org Date: Tue, 17 May 2016 15:57:34 -0000 Message-Id: <9e2bd91a2983474086da8be2f1c2317a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/9] ignite git commit: ignite-1.6 Avoid ConcurrentModificationException from GridDhtPartitionsExchangeFuture.toString archived-at: Tue, 17 May 2016 15:57:36 -0000 Repository: ignite Updated Branches: refs/heads/master 88d9fe679 -> 796d4c422 ignite-1.6 Avoid ConcurrentModificationException from GridDhtPartitionsExchangeFuture.toString Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d2cbcbb8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2cbcbb8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2cbcbb8 Branch: refs/heads/master Commit: d2cbcbb80d9732aef0a809c9c06899130007542c Parents: f07f988 Author: sboikov Authored: Tue May 17 16:50:26 2016 +0300 Committer: sboikov Committed: Tue May 17 16:50:53 2016 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d2cbcbb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index eae7c45..b497f58 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -104,10 +104,11 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter remaining = new HashSet<>(); /** */ + @GridToStringExclude private List srvNodes; /** */ @@ -133,6 +134,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter initFut; /** */ + @GridToStringExclude private final List discoEvts = new ArrayList<>(); /** */ @@ -1643,19 +1645,18 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter remaining; + List srvNodes; synchronized (mux) { - oldestNode = this.crd; remaining = new HashSet<>(this.remaining); + srvNodes = this.srvNodes != null ? new ArrayList<>(this.srvNodes) : null; } return S.toString(GridDhtPartitionsExchangeFuture.class, this, - "oldest", oldestNode == null ? "null" : oldestNode.id(), - "oldestOrder", oldestNode == null ? "null" : oldestNode.order(), "evtLatch", evtLatch == null ? "null" : evtLatch.getCount(), "remaining", remaining, + "srvNodes", srvNodes, "super", super.toString()); } }