#ignite-gg-10369: small fixes. (cherry picked from commit a730127)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/447fc083 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/447fc083 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/447fc083 Branch: refs/heads/ignite-gg-10369-2 Commit: 447fc0835c431ef899ef58413ad2e3a0225ca4a7 Parents: bcb9668 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri May 29 00:01:46 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri May 29 15:01:55 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/util/GridJavaProcess.java | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/447fc083/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 82f4064..6baa179 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 @@ -128,25 +128,27 @@ public final class GridJavaProcess { gjProc.log = log; gjProc.procKilledC = procKilledC; - String javaBin = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java"; - String classpath = System.getProperty("java.class.path"); - String sfcp = System.getProperty("surefire.test.class.path"); - - if (sfcp != null) - classpath += System.getProperty("path.separator") + sfcp; - - if (cp != null) - classpath += System.getProperty("path.separator") + cp; - List<String> procParams = params == null || params.isEmpty() ? Collections.<String>emptyList() : Arrays.asList(params.split(" ")); List<String> procCommands = new ArrayList<>(); + String javaBin = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java"; + procCommands.add(javaBin); procCommands.addAll(jvmArgs == null ? U.jvmArgs() : jvmArgs); - if (!jvmArgs.contains("-cp")) { + if (!jvmArgs.contains("-cp") || !jvmArgs.contains("-classpath")) { + String classpath = System.getProperty("java.class.path"); + + String sfcp = System.getProperty("surefire.test.class.path"); + + if (sfcp != null) + classpath += System.getProperty("path.separator") + sfcp; + + if (cp != null) + classpath += System.getProperty("path.separator") + cp; + procCommands.add("-cp"); procCommands.add(classpath); }
