ignite-471-2: adjusted P2PTestTaskExternalPath to work with PortableMarshaller
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb3bc8fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb3bc8fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb3bc8fe Branch: refs/heads/ignite-471-2 Commit: cb3bc8fe88cdbdb81041b5bda76189415f60f81c Parents: c493627 Author: Denis Magda <dma...@gridgain.com> Authored: Wed May 20 16:42:10 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed May 20 16:42:10 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java | 10 +++++----- .../apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb3bc8fe/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java index c997358..2ae54aa 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java @@ -64,11 +64,11 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer sleep = false; } - Map<TestJob, ClusterNode> jobs = U.newHashMap(subgrid.size()); + Map<TestJob1, ClusterNode> jobs = U.newHashMap(subgrid.size()); for (ClusterNode node : subgrid) { if (nodeIds.contains(node.id())) - jobs.put(new TestJob(node.id(), sleep), node); + jobs.put(new TestJob1(node.id(), sleep), node); } if (!jobs.isEmpty()) @@ -88,7 +88,7 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer * Simple job class */ @SuppressWarnings({"PublicInnerClass"}) - public static class TestJob extends ComputeJobAdapter { + public static class TestJob1 extends ComputeJobAdapter { /** Task session. */ @TaskSessionResource private ComputeTaskSession ses; @@ -107,7 +107,7 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer /** * */ - public TestJob() { + public TestJob1() { // No-op. } @@ -115,7 +115,7 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer * @param nodeId Node ID for node this job is supposed to execute on. * @param sleep Sleep flag. */ - public TestJob(UUID nodeId, boolean sleep) { + public TestJob1(UUID nodeId, boolean sleep) { super(nodeId); this.sleep = sleep; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb3bc8fe/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java index 6c7565b..01f3991 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java @@ -64,11 +64,11 @@ public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer sleep = false; } - Map<TestJob, ClusterNode> jobs = U.newHashMap(subgrid.size()); + Map<TestJob2, ClusterNode> jobs = U.newHashMap(subgrid.size()); for (ClusterNode node : subgrid) { if (nodeIds.contains(node.id())) - jobs.put(new TestJob(node.id(), sleep), node); + jobs.put(new TestJob2(node.id(), sleep), node); } if (!jobs.isEmpty()) @@ -88,7 +88,7 @@ public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer * Simple job class */ @SuppressWarnings("PublicInnerClass") - public static class TestJob extends ComputeJobAdapter { + public static class TestJob2 extends ComputeJobAdapter { /** Ignite instance. */ @IgniteInstanceResource private Ignite ignite; @@ -108,7 +108,7 @@ public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer * @param nodeId Node ID for node this job is supposed to execute on. * @param sleep Sleep flag. */ - public TestJob(UUID nodeId, boolean sleep) { + public TestJob2(UUID nodeId, boolean sleep) { super(nodeId); this.sleep = sleep;
