ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [1/9] ignite git commit: ignite-1.6 Avoid ConcurrentModificationException from GridDhtPartitionsExchangeFuture.toString
Date Tue, 17 May 2016 15:57:34 GMT
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 <sboikov@gridgain.com>
Authored: Tue May 17 16:50:26 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
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<AffinityT
     private volatile DiscoveryEvent discoEvt;
 
     /** */
-    @GridToStringInclude
+    @GridToStringExclude
     private final Set<UUID> remaining = new HashSet<>();
 
     /** */
+    @GridToStringExclude
     private List<ClusterNode> srvNodes;
 
     /** */
@@ -133,6 +134,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
     private GridFutureAdapter<Boolean> initFut;
 
     /** */
+    @GridToStringExclude
     private final List<IgniteRunnable> discoEvts = new ArrayList<>();
 
     /** */
@@ -1643,19 +1645,18 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        ClusterNode oldestNode;
         Set<UUID> remaining;
+        List<ClusterNode> 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());
     }
 }


Mime
View raw message