View | Details | Raw Unified | Return to bug 50130
Collapse All | Expand All

(-)catalina.sh-orig (-2 / +10 lines)
Lines 306-313 Link Here
306
306
307
  if [ ! -z "$CATALINA_PID" ]; then
307
  if [ ! -z "$CATALINA_PID" ]; then
308
    if [ -f "$CATALINA_PID" ]; then
308
    if [ -f "$CATALINA_PID" ]; then
309
      echo "PID file ($CATALINA_PID) found. Is Tomcat still running? Start aborted."
309
      kill -0 `cat $CATALINA_PID` >/dev/null 2>&1
310
      exit 1
310
      if [ $? -eq 1 ]; then
311
        echo "PID file ($CATALINA_PID) found but no matching process found."
312
	echo "Assuming that Tomcat has failed without cleaning PID file."
313
	echo "Starting Tomcat"
314
      else
315
	echo "\$CATALINA_PID set and process found. Tomcat appears to already be running."
316
	echo "Not starting Tomcat"
317
	exit 1
318
      fi
311
    fi
319
    fi
312
  fi
320
  fi
313
321

Return to bug 50130