yoavs 2004/05/26 12:45:33 Modified: catalina/src/bin catalina.sh Log: Fixed stop -force option per Bugzilla 29133. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29133 Revision Changes Path 1.13 +9 -3 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh Index: catalina.sh =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- catalina.sh 14 Mar 2004 17:41:05 -0000 1.12 +++ catalina.sh 26 May 2004 19:45:33 -0000 1.13 @@ -234,6 +234,12 @@ elif [ "$1" = "stop" ] ; then shift + FORCE=0 + if [ "$1" = "-force" ]; then + shift + FORCE=1 + fi + "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ @@ -241,8 +247,7 @@ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ org.apache.catalina.startup.Bootstrap "$@" stop - if [ "$1" = "-force" ] ; then - shift + if [ $FORCE -eq 1 ]; then if [ ! -z "$CATALINA_PID" ]; then echo "Killing: `cat $CATALINA_PID`" kill -9 `cat $CATALINA_PID` @@ -266,6 +271,7 @@ echo " start Start Catalina in a separate window" echo " start -security Start in a separate window with security manager" echo " stop Stop Catalina" + echo " stop -force Stop Catalina (followed by kill -KILL)" exit 1 fi
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
