Repository: karaf Updated Branches: refs/heads/karaf-2.3.x e3ea214d6 -> 2fd11e0ca refs/heads/karaf-2.x 366775dcf -> c538a08ef refs/heads/karaf-3.0.x 95982a845 -> 2f4928f94 refs/heads/master 3e9ac4c71 -> 480979f17
KARAF-3044 - Can't shutdown karaf via wrapper on AIX Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/480979f1 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/480979f1 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/480979f1 Branch: refs/heads/master Commit: 480979f17253fea75911ee5cb2b564540c1e0b15 Parents: 3e9ac4c Author: Jonathan Anstey <[email protected]> Authored: Fri Jun 13 11:22:30 2014 -0230 Committer: Jonathan Anstey <[email protected]> Committed: Fri Jun 13 11:22:30 2014 -0230 ---------------------------------------------------------------------- .../org/apache/karaf/wrapper/internal/unix/karaf-service | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/480979f1/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service ---------------------------------------------------------------------- diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service index a7ca8bb..9f1f004 100644 --- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service +++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service @@ -361,6 +361,9 @@ getpid() { if [ "$DIST_OS" = "solaris" ] then pidtest=`$PSEXE -p $pid -o comm | grep $WRAPPER_CMD | tail -1` + elif [ "$DIST_OS" = "aix" ] + then + pidtest=`$PSEXE -p $pid -o args | grep "$WRAPPER_CMD" | tail -1` else pidtest=`$PSEXE -p $pid -o command | grep $WRAPPER_CMD | tail -1` fi
