From 1b069bd780d341cf0dc00ec84a19d9aef19f327e Mon Sep 17 00:00:00 2001
From: Sajith Ekanayaka <719073+rksk@users.noreply.github.com>
Date: Fri, 3 Mar 2023 15:03:32 +1100
Subject: [PATCH] Fix conflict between JAVA_HOME and PATH

---
 distribution/kernel/carbon-home/bin/wso2server.bat | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/distribution/kernel/carbon-home/bin/wso2server.bat b/distribution/kernel/carbon-home/bin/wso2server.bat
index eb938f9fde6..8704e457be0 100644
--- a/distribution/kernel/carbon-home/bin/wso2server.bat
+++ b/distribution/kernel/carbon-home/bin/wso2server.bat
@@ -132,8 +132,7 @@ rem find the version of the jdk
 set CMD=RUN %*
 
 :checkJdk17
-PATH %PATH%;%JAVA_HOME%\bin\
-for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "JAVA_VERSION=%%j%%k"
+for /f tokens^=2-5^ delims^=.-_^" %%j in ('"%JAVA_HOME%\bin\java" -fullversion 2^>^&1') do set "JAVA_VERSION=%%j%%k"
 if %JAVA_VERSION% LSS 110 goto unknownJdk
 if %JAVA_VERSION% GTR 170 goto unknownJdk
 goto jdk17