You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/20 10:41:47 UTC
[07/10] incubator-ignite git commit: #ignite-961: remove debug.
#ignite-961: remove debug.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9fdb28cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9fdb28cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9fdb28cc
Branch: refs/heads/ignite-961
Commit: 9fdb28cced63a1eba1716e5acf4885ebab5f8186
Parents: 595fe6e
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 20 10:43:07 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 20 10:43:07 2015 +0300
----------------------------------------------------------------------
.../processors/rest/JettyRestProcessorAbstractSelfTest.java | 2 --
.../affinity/rendezvous/RendezvousAffinityFunction.java | 4 ----
.../processors/affinity/GridAffinityAssignmentCache.java | 8 --------
3 files changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fdb28cc/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 9509500..5baab05 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -26,7 +26,6 @@ import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.rest.handlers.*;
import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.testframework.*;
import java.io.*;
@@ -1551,7 +1550,6 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS
protected abstract String signature() throws Exception;
-
/**
* Init cache.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fdb28cc/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
index 81472f0..2b26630 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
@@ -290,10 +290,6 @@ public class RendezvousAffinityFunction implements AffinityFunction, Externaliza
try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
- if (ignite == null)
- System.out.println("IGNITE IS NULL!!!");
-
-
byte[] nodeHashBytes = ignite.configuration().getMarshaller().marshal(nodeHash);
out.write(U.intToBytes(part), 0, 4); // Avoid IOException.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fdb28cc/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index 281c153..d40128c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import org.jsr166.*;
@@ -186,13 +185,6 @@ public class GridAffinityAssignmentCache {
Collections.sort(sorted, GridNodeOrderComparator.INSTANCE);
}
- /*try {
- ctx.grid().context().resource().injectGeneric(aff);
- }
- catch (IgniteCheckedException e) {
- U.convertException(e);
- }*/
-
List<List<ClusterNode>> prevAssignment = prev == null ? null : prev.assignment();
List<List<ClusterNode>> assignment;