svn commit: r1850829 - in /tomcat/trunk: bin/catalina.sh webapps/docs/changelog.xml

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

svn commit: r1850829 - in /tomcat/trunk: bin/catalina.sh webapps/docs/changelog.xml

markt
Author: markt
Date: Wed Jan  9 09:04:56 2019
New Revision: 1850829

URL: http://svn.apache.org/viewvc?rev=1850829&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63041
Correct a regression in the fix for bug 53930 that prevented Tomcat from working correctly with systemd.
Patch provided by Patrik S.

Modified:
    tomcat/trunk/bin/catalina.sh
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/bin/catalina.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1850829&r1=1850828&r2=1850829&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Wed Jan  9 09:04:56 2019
@@ -476,7 +476,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 \
@@ -486,7 +486,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
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1850829&r1=1850828&r2=1850829&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jan  9 09:04:56 2019
@@ -189,6 +189,11 @@
         provided with Apache Tomcat. Includes contributions from Victor Caetano
         and Dabilo. (markt)
       </add>
+      <fix>
+        <bug>63041</bug>: Correct a regression in the fix for <bug>53930</bug>
+        that prevented Tomcat from working correctly with systemd. Patch
+        provided by Patrik S. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>



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