You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@karaf.apache.org by gn...@apache.org on 2012/05/22 01:27:40 UTC

svn commit: r1341269 - /karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceImpl.java

Author: gnodet
Date: Mon May 21 23:27:40 2012
New Revision: 1341269

URL: http://svn.apache.org/viewvc?rev=1341269&view=rev
Log:
[KARAF-1491] Admin service not able to start child instances when the JDK path contains a space on OS X


Conflicts:

	instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceImpl.java

Modified:
    karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceImpl.java

Modified: karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceImpl.java?rev=1341269&r1=1341268&r2=1341269&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceImpl.java (original)
+++ karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceImpl.java Mon May 21 23:27:40 2012
@@ -237,8 +237,9 @@ public class InstanceImpl implements Ins
             }
             classpath.append(jar.getCanonicalPath());
         }
-        String command = new File(System.getProperty("java.home"), ScriptUtils.isWindows() ? "bin\\java.exe" : "bin/java").getCanonicalPath()
-                + " " + javaOpts 
+        String command = "\""
+                + new File(System.getProperty("java.home"), ScriptUtils.isWindows() ? "bin\\java.exe" : "bin/java").getCanonicalPath()
+                + "\" " + javaOpts
                 + " " + karafOpts
                 + " -Djava.util.logging.config.file=\"" + new File(location, "etc/java.util.logging.properties").getCanonicalPath() + "\""
                 + " -Djava.endorsed.dirs=\"" + new File(new File(new File(System.getProperty("java.home"), "jre"), "lib"), "endorsed") + System.getProperty("path.separator") + new File(new File(System.getProperty("java.home"), "lib"), "endorsed") + System.getProperty("path.separator") + new File(libDir, "endorsed").getCanonicalPath() + "\""