Author: markt
Date: Mon Sep 21 10:04:43 2015
New Revision: 1704251
URL: http://svn.apache.org/viewvc?rev=1704251&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58416
Correctly detect when a forced stop fails to stop Tomcat because the Tomcat
process is waiting on some system call or is UNINTERRUPTIBLE.
Modified:
tomcat/trunk/bin/catalina.sh
Modified: tomcat/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1704251&r1=1704250&r2=1704251&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Mon Sep 21 10:04:43 2015
@@ -512,8 +512,6 @@ elif [ "$1" = "stop" ] ; then
echo "The PID file could not be removed."
fi
fi
- # Set this to zero else a warning will be issued about the
process still running
- KILL_SLEEP_INTERVAL=0
echo "The Tomcat process has been killed."
break
fi
@@ -522,7 +520,7 @@ elif [ "$1" = "stop" ] ; then
fi
KILL_SLEEP_INTERVAL=`expr $KILL_SLEEP_INTERVAL - 1 `
done
- if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then
+ if [ $KILL_SLEEP_INTERVAL -lt 0 ]; then
echo "Tomcat has not been killed completely yet. The process might
be waiting on some system call or might be UNINTERRUPTIBLE."
fi
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
