Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10369-2 [created] d66a141c1
#ignite-gg-10369: Add test for two nodes. (cherry picked from commit b62bc14) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8faa72cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8faa72cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8faa72cc Branch: refs/heads/ignite-gg-10369-2 Commit: 8faa72cc9b7c766e9d65e6dc8802b54f858a4783 Parents: 7ec4c82 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu May 28 16:36:44 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri May 29 15:01:48 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/util/GridJavaProcess.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8faa72cc/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java index bff26ec..82f4064 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java @@ -145,8 +145,12 @@ public final class GridJavaProcess { procCommands.add(javaBin); procCommands.addAll(jvmArgs == null ? U.jvmArgs() : jvmArgs); - procCommands.add("-cp"); - procCommands.add(classpath); + + if (!jvmArgs.contains("-cp")) { + procCommands.add("-cp"); + procCommands.add(classpath); + } + procCommands.add(clsName); procCommands.addAll(procParams);
