[activemq] branch main updated: AMQ-8226 match any amount of spaces before activemq PID in bin/activemq startup script

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/main by this push:
     new f1190f8  AMQ-8226 match any amount of spaces before activemq PID in bin/activemq startup script
     new bd5af82  Merge pull request #648 from Charlie-chenchrl/AMQ-8226
f1190f8 is described below

commit f1190f8feddb68e27eb1b7484f2a0928e32996f9
Author: charlie-aws <ch...@amazon.com>
AuthorDate: Thu Apr 15 16:07:14 2021 -0700

    AMQ-8226 match any amount of spaces before activemq PID in bin/activemq startup script
---
 assembly/src/release/bin/activemq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 66fca3e..07af279 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -476,7 +476,7 @@ checkRunning(){
         return 2
        fi
        local activemq_pid="`cat "$pidfile"`"
-       local RET="`ps -o "pid,args" | grep "^$activemq_pid\s.*java"`"
+       local RET="`ps -o "pid,args" | grep "^\s*$activemq_pid\s.*java"`"
        if [ -n "$RET" ];then
          return 0;
        else