ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] incubator-ignite git commit: #ignite-gg-10369: Add test for two nodes.
Date Thu, 28 May 2015 15:21:53 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-gg-10369 [created] f23566ef0


#ignite-gg-10369: Add test for two nodes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b62bc14a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b62bc14a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b62bc14a

Branch: refs/heads/ignite-gg-10369
Commit: b62bc14a23546eac4f9c33fcbe33af096510c585
Parents: b6fc8a9
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Thu May 28 16:36:44 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Thu May 28 16:36:44 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/b62bc14a/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);
 


Mime
View raw message