6467

Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff084537
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff084537
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff084537

Branch: refs/heads/ignite-6467
Commit: ff084537a0c4ad417e7eb60bf3d8c39987ad98db
Parents: ebdf7b9
Author: sboikov <sboi...@apache.org>
Authored: Fri Jul 27 18:01:20 2018 +0300
Committer: sboikov <sboi...@apache.org>
Committed: Fri Jul 27 18:01:20 2018 +0300

----------------------------------------------------------------------
 modules/core/src/main/java/org/apache/ignite/TestDebugLog1.java    | 2 ++
 .../cache/distributed/dht/GridDhtPartitionTopologyImpl.java        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ff084537/modules/core/src/main/java/org/apache/ignite/TestDebugLog1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/TestDebugLog1.java 
b/modules/core/src/main/java/org/apache/ignite/TestDebugLog1.java
index 318028c..a33390c 100644
--- a/modules/core/src/main/java/org/apache/ignite/TestDebugLog1.java
+++ b/modules/core/src/main/java/org/apache/ignite/TestDebugLog1.java
@@ -431,6 +431,8 @@ public class TestDebugLog1 {
     }
 
     public static void printKeyAndPartMessages(String fileName, Object key, 
int partId, int cacheId) {
+        fileName = null;
+
         assert key != null;
 
         List<Object> msgs0;

http://git-wip-us.apache.org/repos/asf/ignite/blob/ff084537/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 324048f..aa43b2f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -912,7 +912,7 @@ public class GridDhtPartitionTopologyImpl implements 
GridDhtPartitionTopology {
                 else if (loc != null && state == RENTING && !showRenting) {
                     throw new GridDhtInvalidPartitionException(p, "Adding 
entry to partition that is concurrently " +
                         "evicted [grp=" + grp.cacheOrGroupName() + ", part=" + 
p + ", shouldBeMoving="
-                        + ", belongs=" + belongs + ", belongs0=" + 
partitionLocalNode(p, this.readyTopVer) + ", topVer=" + topVer + ", curTopVer=" 
+ this.readyTopVer + "]");
+                        + ", belongs=" + belongs + ", topVer=" + topVer + ", 
curTopVer=" + this.readyTopVer + "]");
                 }
 
                 if (loc == null) {

Reply via email to