Repository: karaf Updated Branches: refs/heads/karaf-4.0.x 9eb49bbfc -> 074b4fbbf
[KARAF-4349] Use the same approach of KARAF-4330 in karaf.bat script. A little fix. Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/074b4fbb Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/074b4fbb Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/074b4fbb Branch: refs/heads/karaf-4.0.x Commit: 074b4fbbf423ce6cdef20a91435cb4dba02b4a9f Parents: 9eb49bb Author: Andrea Cosentino <[email protected]> Authored: Tue Mar 1 10:59:42 2016 +0100 Committer: Andrea Cosentino <[email protected]> Committed: Tue Mar 1 11:18:13 2016 +0100 ---------------------------------------------------------------------- .../features/base/src/main/resources/resources/bin/karaf.bat | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/074b4fbb/assemblies/features/base/src/main/resources/resources/bin/karaf.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf.bat b/assemblies/features/base/src/main/resources/resources/bin/karaf.bat index 8b36998..611e5d0 100644 --- a/assemblies/features/base/src/main/resources/resources/bin/karaf.bat +++ b/assemblies/features/base/src/main/resources/resources/bin/karaf.bat @@ -220,7 +220,10 @@ if not "%JAVA%" == "" goto :Check_JAVA_END set ROOT_INSTANCE_PID=%pid:~13% set ROOT_INSTANCE_NAME=%name:~14% - if not "%ROOT_INSTANCE_PID%"=="0" ( + SET CHECK_RUNNING_CONDITION=true + if "%ROOT_INSTANCE_PID%" == "~13" SET CHECK_RUNNING_CONDITION=false + if "%ROOT_INSTANCE_PID%" == "0" SET CHECK_RUNNING_CONDITION=false + if "%CHECK_RUNNING_CONDITION%" == "true" ( tasklist /fi "PID eq %ROOT_INSTANCE_PID%" /fi "STATUS eq running" /fo 2>NUL if "%ERRORLEVEL%"=="0" set ROOT_INSTANCE_RUNNING=true )
