Repository: karaf Updated Branches: refs/heads/master 30516e9e3 -> b8b93d6dd
[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/b8b93d6d Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b8b93d6d Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b8b93d6d Branch: refs/heads/master Commit: b8b93d6dd2cf777df0d5d730e55e5436498da4d2 Parents: 30516e9 Author: Andrea Cosentino <[email protected]> Authored: Tue Mar 1 10:59:42 2016 +0100 Committer: Andrea Cosentino <[email protected]> Committed: Tue Mar 1 10:59:42 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/b8b93d6d/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 011d72c..515faf0 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 )
