Author: rmannibucau
Date: Fri Sep 19 21:16:30 2014
New Revision: 1626337
URL: http://svn.apache.org/r1626337
Log:
TOMEE-1352 fixing javaagent handling in catalina.sh
Modified:
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
Modified:
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1626337&r1=1626336&r2=1626337&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
Fri Sep 19 21:16:30 2014
@@ -470,7 +470,7 @@ public class Installer implements Instal
final String newCatalinaSh = catalinaShOriginal.replace("# -----
Execute The Requested Command",
"# Add OpenEJB javaagent\n" +
"if [ -r \"$CATALINA_HOME\"/" + openejbJavaagentPath +
" ]; then\n" +
- " JAVA_OPTS=\"\"-javaagent:$CATALINA_HOME/" +
openejbJavaagentPath + "\" $JAVA_OPTS\"\n" +
+ " JAVA_OPTS=\"'-javaagent:$CATALINA_HOME/" +
openejbJavaagentPath + "' $JAVA_OPTS\"\n" +
"fi\n" +
"\n" +
"# ----- Execute The Requested Command");