projects
/
tomcat7.0
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c0ae70b
)
More review comments form mturk. Tighten up handling of ps output.
author
markt
<markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 28 Sep 2010 21:30:27 +0000
(21:30 +0000)
committer
markt
<markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 28 Sep 2010 21:30:27 +0000
(21:30 +0000)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@
1002362
13f79535
-47bb-0310-9956-
ffa450edef68
bin/catalina.sh
patch
|
blob
|
history
diff --git
a/bin/catalina.sh
b/bin/catalina.sh
index
ca8b292
..
84daac1
100755
(executable)
--- a/
bin/catalina.sh
+++ b/
bin/catalina.sh
@@
-323,7
+323,8
@@
elif [ "$1" = "start" ] ; then
if [ -s "$CATALINA_PID" ]; then
if [ -r "$CATALINA_PID" ]; then
PID="`cat "$CATALINA_PID"`"
- if ps -p $PID > /dev/null; then
+ ps -p $PID > /dev/null 2>&1
+ if [ $? -eq 0 ] ; then
echo "Tomcat appears to still be running with PID $PID. Start aborted."
exit 1
else