svn commit: r1850831 - /tomcat/tc7.0.x/trunk/bin/catalina.sh

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1850831 - /tomcat/tc7.0.x/trunk/bin/catalina.sh

markt
Author: markt
Date: Wed Jan  9 09:11:19 2019
New Revision: 1850831

URL: http://svn.apache.org/viewvc?rev=1850831&view=rev
Log:
Correct a regression in the fix for bug 53930 that prevented Tomcat from working correctly with systemd.
Patch provided by Patrik S.

Modified:
    tomcat/tc7.0.x/trunk/bin/catalina.sh

Modified: tomcat/tc7.0.x/trunk/bin/catalina.sh
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.sh?rev=1850831&r1=1850830&r2=1850831&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/catalina.sh Wed Jan  9 09:11:19 2019
@@ -451,7 +451,7 @@ elif [ "$1" = "start" ] ; then
       -Dcatalina.home="\"$CATALINA_HOME\"" \
       -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
       org.apache.catalina.startup.Bootstrap "$@" start \
-      2\>\&1 \& echo \$! \>\"$catalina_pid_file\" \; \} $catalina_out_command "&"
+      2\>\&1 \&\& echo \$! \>\"$catalina_pid_file\" \; \} $catalina_out_command "&"
 
   else
     eval \{ $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
@@ -461,7 +461,7 @@ elif [ "$1" = "start" ] ; then
       -Dcatalina.home="\"$CATALINA_HOME\"" \
       -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
       org.apache.catalina.startup.Bootstrap "$@" start \
-      2\>\&1 \& echo \$! \>\"$catalina_pid_file\" \; \} $catalina_out_command "&"
+      2\>\&1 \&\& echo \$! \>\"$catalina_pid_file\" \; \} $catalina_out_command "&"
 
   fi
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]