From 6d2e0f5fb4f369277edaf9b4c153403e2d673906 Mon Sep 17 00:00:00 2001
From: f1ori <f1ori@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sun, 29 Aug 2010 23:26:03 +0000
Subject: [PATCH] always kill shutdown java instance, even if yacy succeeded,
 in future, the TERM-signal should be used, but currently not all threads are
 joined during shutdown

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7083 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 addon/yacyInit.m4 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addon/yacyInit.m4 b/addon/yacyInit.m4
index ff2e9d64b..b49549bce 100644
--- a/addon/yacyInit.m4
+++ b/addon/yacyInit.m4
@@ -261,17 +261,19 @@ ifdef(`ArchLinux', `
 			let timeout=$timeout-1
 			if [ $timeout -eq 0 ]; then
 				kill -9 $pid &>/dev/null
-				# dont forget to kill shutdown process if necessary
-				shutdown_pid=$( ps ax | grep $shutdown_pid | awk '{ print $1 }' | grep $shutdown_pid )
-				if [ -n "$shutdown_pid" ] ; then
-					kill -9 $shutdown_pid
-				fi
 				break
 			fi
 			echo -n  "."
 			sleep 1
 			pidno=$( ps ax | grep $pid | awk '{ print $1 }' | grep $pid )
 		done
+
+		# dont forget to kill shutdown process if necessary
+		shutdown_pid=$( ps ax | grep $shutdown_pid | awk '{ print $1 }' | grep $shutdown_pid )
+		if [ -n "$shutdown_pid" ] ; then
+			kill -9 $shutdown_pid
+		fi
+
 		if [ "$2" != "--leave-pidfile" ]; then
 			rm $PID_FILE
 ifdef(`ArchLinux', `