Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-648 9c96a2f06 -> 1e7889b5e
# ignite-648: review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1e7889b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1e7889b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1e7889b5
Branch: refs/heads/ignite-648
Commit: 1e7889b5e1c5b47a3132cf829dc159b913b726ec
Parents: 9c96a2f
Author: ashutak <as...@gridgain.com>
Authored: Fri Jul 10 18:25:52 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Fri Jul 10 18:25:52 2015 +0300
----------------------------------------------------------------------
.../ignite/testframework/junits/GridAbstractTest.java | 2 +-
.../junits/multijvm/IgniteProcessProxy.java | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e7889b5/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 3d27d2d..06a1523 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1383,7 +1383,7 @@ public abstract class GridAbstractTest extends TestCase {
* @return <code>True</code> if test was run in multi-JVM mode and grid with this name was started at another JVM.
*/
protected boolean isRemoteJvm(String gridName) {
- return isMultiJvm() && !gridName.endsWith("0");
+ return isMultiJvm() && !"0".equals(gridName.substring(getTestGridName().length()));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e7889b5/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
index ff1b62b..220424a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
@@ -103,7 +103,18 @@ public class IgniteProcessProxy implements IgniteEx {
assert rmtNodeStartedLatch.await(30, TimeUnit.SECONDS): "Remote node has not joined [id=" + id + ']';
- gridProxies.put(cfg.getGridName(), this);
+ IgniteProcessProxy prevVal = gridProxies.putIfAbsent(cfg.getGridName(), this);
+
+ if (prevVal != null) {
+ remoteCompute().run(new IgniteRunnable() {
+ @Override public void run() {
+ G.stop(cfg.getGridName(), true);
+ }
+ });
+
+ throw new IllegalStateException("There was found instance assotiated with " + cfg.getGridName() +
+ ", instance= " + prevVal + ". New started node was stopped.");
+ }
}
/**