You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/24 13:57:16 UTC
[50/50] incubator-ignite git commit: # ignite-648: simple fix
# ignite-648: simple fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a7ad0eaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7ad0eaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7ad0eaf
Branch: refs/heads/ignite-648
Commit: a7ad0eaffa93290d60116515fc23e9bf95f50f12
Parents: 705784b
Author: ashutak <as...@gridgain.com>
Authored: Wed Jun 24 14:56:40 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Wed Jun 24 14:56:40 2015 +0300
----------------------------------------------------------------------
.../testframework/junits/GridAbstractTest.java | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7ad0eaf/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 644d972..f329d98 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
@@ -683,14 +683,18 @@ public abstract class GridAbstractTest extends TestCase {
* @throws Exception If failed.
*/
protected Ignite startGrid(String gridName, GridSpringResourceContext ctx) throws Exception {
- startingGrid.set(gridName);
+ if (!isMultiJvmAndNodeIsRemote(gridName)) {
+ startingGrid.set(gridName);
- try {
- return IgnitionEx.start(optimize(getConfiguration(gridName)), ctx);
- }
- finally {
- startingGrid.set(null);
+ try {
+ return IgnitionEx.start(optimize(getConfiguration(gridName)), ctx);
+ }
+ finally {
+ startingGrid.set(null);
+ }
}
+ else
+ return startRemoteGrid(gridName, ctx);
}
/**
@@ -701,8 +705,10 @@ public abstract class GridAbstractTest extends TestCase {
* @return Started grid.
* @throws Exception If failed.
*/
- // TODO review. Is it okey that ctx doesn't used?
protected Ignite startRemoteGrid(String gridName, GridSpringResourceContext ctx) throws Exception {
+ if (ctx != null)
+ throw new UnsupportedOperationException("Starting of grid at another jvm by context doesn't supported.");
+
return new IgniteProcessProxy(optimize(getConfiguration(gridName)), log, grid(0));
}