You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/02/15 11:18:36 UTC
svn commit: r1730485 -
/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds
Author: elecharny
Date: Mon Feb 15 10:18:36 2016
New Revision: 1730485
URL: http://svn.apache.org/viewvc?rev=1730485&view=rev
Log:
Applied patch from DIRSERVER-1843
Modified:
directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds
Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds?rev=1730485&r1=1730484&r2=1730485&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds Mon Feb 15 10:18:36 2016
@@ -319,22 +319,22 @@ getpid() {
if [ -r "$PIDFILE" ]
then
pid=`cat "$PIDFILE"`
- #if [ "X$pid" != "X" ]
- #then
- # # It is possible that 'a' process with the pid exists but that it is not the
- # # correct process. This can happen in a number of cases, but the most
- # # common is during system startup after an unclean shutdown.
- # # The ps statement below looks for the specific wrapper command running as
- # # the pid. If it is not found then the pid file is considered to be stale.
- # pidtest=`$PSEXE -p $pid -o args | grep "$WRAPPER_CMD" | tail -1`
- # if [ "X$pidtest" = "X" ]
- # then
- # # This is a stale pid file.
- # rm -f "$PIDFILE"
- # echo "Removed stale pid file: $PIDFILE"
- # pid=""
- # fi
- #fi
+ if [ "X$pid" != "X" ]
+ then
+ # It is possible that 'a' process with the pid exists but that it is not the
+ # correct process. This can happen in a number of cases, but the most
+ # common is during system startup after an unclean shutdown.
+ # The ps statement below looks for the specific wrapper command running as
+ # the pid. If it is not found then the pid file is considered to be stale.
+ pidtest=`$PSEXE -p $pid -o args | grep "$WRAPPER_CMD" | tail -1`
+ if [ "X$pidtest" = "X" ]
+ then
+ # This is a stale pid file.
+ rm -f "$PIDFILE"
+ echo "Removed stale pid file: $PIDFILE"
+ pid=""
+ fi
+ fi
else
echo "Cannot read $PIDFILE."
exit 1