You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/07/19 19:39:41 UTC
svn commit: r423580 - in
/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent:
jmx/JMXTomcat.java tomcat/HttpTomcat.java
Author: toback
Date: Wed Jul 19 12:39:40 2006
New Revision: 423580
URL: http://svn.apache.org/viewvc?rev=423580&view=rev
Log:
Fixed bug where empty args were passed to the ProcessBuilder casuing jvms to not start.
Modified:
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXTomcat.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/tomcat/HttpTomcat.java
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXTomcat.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXTomcat.java?rev=423580&r1=423579&r2=423580&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXTomcat.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXTomcat.java Wed Jul 19 12:39:40 2006
@@ -369,7 +369,8 @@
}
public String[] getStartCommand() {
- return (javaHome + "/bin/java " + this.getJavaOptions() + ' ' + this.getStartClass() + " start").split(" ");
+ String sa = (javaHome + "/bin/java " + this.getJavaOptions() + ' ' + this.getStartClass() + " start");
+ return sa.replaceAll(" +"," ").split(" ");
}
private boolean invokeVoidMethod(ObjectName obj, String method, Object[] params, String[] signature) {
@@ -474,7 +475,7 @@
return result;
}
-
+
}
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/tomcat/HttpTomcat.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/tomcat/HttpTomcat.java?rev=423580&r1=423579&r2=423580&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/tomcat/HttpTomcat.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/tomcat/HttpTomcat.java Wed Jul 19 12:39:40 2006
@@ -29,6 +29,7 @@
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
+import java.util.regex.Pattern;
/**
* @author Stephen Toback
@@ -164,7 +165,8 @@
}
public String[] getStartCommand() {
- return (javaHome + "/bin/java " + this.getJavaOptions() + ' ' + this.getStartClass() + " start").split(" ");
+ String sa = (javaHome + "/bin/java " + this.getJavaOptions() + ' ' + this.getStartClass() + " start");
+ return sa.replaceAll(" +"," ").split(" ");
}
public Map<String, String> getEnv() {