From lokahi-commits-return-170-apmail-incubator-lokahi-commits-archive=incubator.apache.org@incubator.apache.org Wed Jul 19 19:40:02 2006 Return-Path: Delivered-To: apmail-incubator-lokahi-commits-archive@locus.apache.org Received: (qmail 67899 invoked from network); 19 Jul 2006 19:40:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Jul 2006 19:40:02 -0000 Received: (qmail 75737 invoked by uid 500); 19 Jul 2006 19:40:02 -0000 Delivered-To: apmail-incubator-lokahi-commits-archive@incubator.apache.org Received: (qmail 75720 invoked by uid 500); 19 Jul 2006 19:40:02 -0000 Mailing-List: contact lokahi-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lokahi-dev@incubator.apache.org Delivered-To: mailing list lokahi-commits@incubator.apache.org Received: (qmail 75711 invoked by uid 99); 19 Jul 2006 19:40:02 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jul 2006 12:40:02 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jul 2006 12:40:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id ABA571A981A; Wed, 19 Jul 2006 12:39:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r423580 - in /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent: jmx/JMXTomcat.java tomcat/HttpTomcat.java Date: Wed, 19 Jul 2006 19:39:41 -0000 To: lokahi-commits@incubator.apache.org From: toback@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060719193941.ABA571A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 getEnv() {