From fffde08f4dfe23d89e6a45f5aa64e50bfe9d0149 Mon Sep 17 00:00:00 2001
From: Dasarathi Rout <dasarathi.rout@oracle.com>
Date: Tue, 29 Jul 2025 21:10:00 +0530
Subject: [PATCH 1/7] oracle-visualvm-issues-623 Added JAVA_HOME to visulavm
 luncher & conf

Signed-off-by: Dasarathi Rout <dasarathi.rout@oracle.com>
---
 visualvm/launcher/visualvm      | 6 +++++-
 visualvm/launcher/visualvm.conf | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/visualvm/launcher/visualvm b/visualvm/launcher/visualvm
index 4e7c7c0d45..5e7b4fc1d4 100644
--- a/visualvm/launcher/visualvm
+++ b/visualvm/launcher/visualvm
@@ -63,7 +63,11 @@ esac
 
 
 if [ -f "$progdir"/../lib/visualvm/etc/visualvm.conf ] ; then
-    visualvm_jdkhome="$basedir"
+    if [[ -d "$JAVA_HOME" && -f "$JAVA_HOME/bin/java" ]]; then
+        visualvm_jdkhome="$JAVA_HOME"
+    else
+        visualvm_jdkhome="$basedir"
+    fi
     old=`pwd`
     cd "$progdir/../lib/visualvm/"
     basedir=`pwd`
diff --git a/visualvm/launcher/visualvm.conf b/visualvm/launcher/visualvm.conf
index 2ab23dffea..e2acb7be23 100644
--- a/visualvm/launcher/visualvm.conf
+++ b/visualvm/launcher/visualvm.conf
@@ -69,7 +69,7 @@ visualvm_default_options="-J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class
 # installer points to one of those in the VisualVM application shortcut 
 # based on the Java version selected at installation time.
 #
-#visualvm_jdkhome="/path/to/jdk"
+visualvm_jdkhome="${JAVA_HOME}"
 
 # Additional module clusters:
 # using ${path.separator} (';' on Windows or ':' on Unix):

From 8649d0c1ba51f204674fc67c235043010d0228c9 Mon Sep 17 00:00:00 2001
From: Dasarathi Rout <dasarathi.rout@oracle.com>
Date: Tue, 29 Jul 2025 21:10:00 +0530
Subject: [PATCH 2/7] oracle-visualvm-issues-623 Added JAVA_HOME to visulavm
 luncher & conf

Signed-off-by: Dasarathi Rout <dasarathi.rout@oracle.com>
---
 .gitignore                 | 2 ++
 visualvm/launcher/visualvm | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9170a81845..70650195cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@
 
 # Ignore Mac DS_Store files
 .DS_Store
+/.idea/
+/.oca/
\ No newline at end of file
diff --git a/visualvm/launcher/visualvm b/visualvm/launcher/visualvm
index 4e7c7c0d45..cd5811cacd 100644
--- a/visualvm/launcher/visualvm
+++ b/visualvm/launcher/visualvm
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,13 @@ case "`uname`" in
         ;;
 esac
 
+# Check if JDK_HOME is set and valid
+if [ -n "${JDK_HOME}" ] && [ -d "${JDK_HOME}" ] && [ -f "${JDK_HOME}/bin/java" ]; then
+	visualvm_jdkhome="${JDK_HOME}"
+# Check if JAVA_HOME is set and valid
+elif [ -n "${JAVA_HOME}" ] && [ -d "${JAVA_HOME}" ] && [ -f "${JAVA_HOME}/bin/java" ]; then
+	visualvm_jdkhome="${JAVA_HOME}"
+fi
 
 if [ -f "$progdir"/../lib/visualvm/etc/visualvm.conf ] ; then
     visualvm_jdkhome="$basedir"

From 613e6fb04060cb77e201a04e2211f1f22a822d71 Mon Sep 17 00:00:00 2001
From: Dasarathi Rout <dasarathi.rout@oracle.com>
Date: Sat, 2 Aug 2025 21:07:04 +0530
Subject: [PATCH 3/7] oracle-visualvm-issues-623 Added JAVA_HOME to visulavm
 luncher & conf

Signed-off-by: Dasarathi Rout <dasarathi.rout@oracle.com>
---
 visualvm/launcher/visualvm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/visualvm/launcher/visualvm.conf b/visualvm/launcher/visualvm.conf
index e2acb7be23..2ab23dffea 100644
--- a/visualvm/launcher/visualvm.conf
+++ b/visualvm/launcher/visualvm.conf
@@ -69,7 +69,7 @@ visualvm_default_options="-J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class
 # installer points to one of those in the VisualVM application shortcut 
 # based on the Java version selected at installation time.
 #
-visualvm_jdkhome="${JAVA_HOME}"
+#visualvm_jdkhome="/path/to/jdk"
 
 # Additional module clusters:
 # using ${path.separator} (';' on Windows or ':' on Unix):

From 2fe495774f5b1df0c550b7e779a373ee0af41f14 Mon Sep 17 00:00:00 2001
From: Dasarathi Rout <dasarathi.rout@oracle.com>
Date: Sat, 2 Aug 2025 21:08:54 +0530
Subject: [PATCH 4/7] oracle-visualvm-issues-623 Added JAVA_HOME to visulavm
 luncher & conf

Signed-off-by: Dasarathi Rout <dasarathi.rout@oracle.com>
---
 visualvm/launcher/visualvm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/visualvm/launcher/visualvm b/visualvm/launcher/visualvm
index a518b06845..82ec1714d8 100644
--- a/visualvm/launcher/visualvm
+++ b/visualvm/launcher/visualvm
@@ -70,10 +70,7 @@ elif [ -n "${JAVA_HOME}" ] && [ -d "${JAVA_HOME}" ] && [ -f "${JAVA_HOME}/bin/ja
 fi
 
 if [ -f "$progdir"/../lib/visualvm/etc/visualvm.conf ] ; then
-    if [[ -d "$JAVA_HOME" && -f "$JAVA_HOME/bin/java" ]]; then
-        visualvm_jdkhome="$JAVA_HOME"
-    else
-        visualvm_jdkhome="$basedir"
+    visualvm_jdkhome="$basedir"
     fi
     old=`pwd`
     cd "$progdir/../lib/visualvm/"

From f01448f63b1a3dc18288f9c0cb523367af075527 Mon Sep 17 00:00:00 2001
From: Dasarathi Rout <dasarathi.rout@oracle.com>
Date: Sat, 2 Aug 2025 21:10:26 +0530
Subject: [PATCH 5/7] oracle-visualvm-issues-623 Added JAVA_HOME to visulavm
 luncher & conf

Signed-off-by: Dasarathi Rout <dasarathi.rout@oracle.com>
---
 visualvm/launcher/visualvm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/visualvm/launcher/visualvm b/visualvm/launcher/visualvm
index 82ec1714d8..cd5811cacd 100644
--- a/visualvm/launcher/visualvm
+++ b/visualvm/launcher/visualvm
@@ -71,7 +71,6 @@ fi
 
 if [ -f "$progdir"/../lib/visualvm/etc/visualvm.conf ] ; then
     visualvm_jdkhome="$basedir"
-    fi
     old=`pwd`
     cd "$progdir/../lib/visualvm/"
     basedir=`pwd`

From 473bf6b0ea9cd717410cfeedc5a90a450d418f5d Mon Sep 17 00:00:00 2001
From: Dasarathi Rout <dasarathi.rout@oracle.com>
Date: Tue, 5 Aug 2025 22:29:51 +0530
Subject: [PATCH 6/7] oracle-visualvm-issues-623 Added JAVA_HOME to visulavm
 luncher & conf

Signed-off-by: Dasarathi Rout <dasarathi.rout@oracle.com>
---
 visualvm/launcher/visualvm | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/visualvm/launcher/visualvm b/visualvm/launcher/visualvm
index cd5811cacd..921c2c3369 100644
--- a/visualvm/launcher/visualvm
+++ b/visualvm/launcher/visualvm
@@ -61,16 +61,26 @@ case "`uname`" in
         ;;
 esac
 
-# Check if JDK_HOME is set and valid
-if [ -n "${JDK_HOME}" ] && [ -d "${JDK_HOME}" ] && [ -f "${JDK_HOME}/bin/java" ]; then
-	visualvm_jdkhome="${JDK_HOME}"
-# Check if JAVA_HOME is set and valid
-elif [ -n "${JAVA_HOME}" ] && [ -d "${JAVA_HOME}" ] && [ -f "${JAVA_HOME}/bin/java" ]; then
-	visualvm_jdkhome="${JAVA_HOME}"
-fi
+set_jdk_java_home_from_env_vars() {
+  # Check if JDK_HOME is set and valid
+  if [ -n "${JDK_HOME}" ] && [ -d "${JDK_HOME}" ] && [ -f "${JDK_HOME}/bin/java" ]; then
+  	visualvm_jdkhome="${JDK_HOME}"
+  # Check if JAVA_HOME is set and valid
+  elif [ -n "${JAVA_HOME}" ] && [ -d "${JAVA_HOME}" ] && [ -f "${JAVA_HOME}/bin/java" ]; then
+  	visualvm_jdkhome="${JAVA_HOME}"
+  fi
+}
+
+set_jdk_java_home_from_conf(){
+  # After loading visualvm.conf , check if visualvm_jdkhome defined & its valid. Else fallback to jdk env
+  if [ -n "${visualvm_jdkhome}" ] && [ -d "${visualvm_jdkhome}" ] && [ -f "${visualvm_jdkhome}/bin/java" ]; then
+    : # No-Op
+  else
+    set_jdk_java_home_from_env_vars
+  fi
+}
 
 if [ -f "$progdir"/../lib/visualvm/etc/visualvm.conf ] ; then
-    visualvm_jdkhome="$basedir"
     old=`pwd`
     cd "$progdir/../lib/visualvm/"
     basedir=`pwd`
@@ -80,6 +90,7 @@ elif [ -f "$progdir"/../etc/visualvm.conf ] ; then
     . "$progdir"/../etc/visualvm.conf
 fi
 
+set_jdk_java_home_from_conf
 
 export DEFAULT_USERDIR_ROOT
 

From a8b5b7beb141b1fc4b6f12b8a8693066a361739e Mon Sep 17 00:00:00 2001
From: Dasarathi Rout <dasarathi.rout@oracle.com>
Date: Wed, 6 Aug 2025 16:30:13 +0530
Subject: [PATCH 7/7] oracle-visualvm-issues-623 Added JAVA_HOME to visulavm
 luncher & conf

Signed-off-by: Dasarathi Rout <dasarathi.rout@oracle.com>
---
 visualvm/launcher/visualvm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/visualvm/launcher/visualvm b/visualvm/launcher/visualvm
index 921c2c3369..589cffcd10 100644
--- a/visualvm/launcher/visualvm
+++ b/visualvm/launcher/visualvm
@@ -71,7 +71,7 @@ set_jdk_java_home_from_env_vars() {
   fi
 }
 
-set_jdk_java_home_from_conf(){
+set_jdk_java_home(){
   # After loading visualvm.conf , check if visualvm_jdkhome defined & its valid. Else fallback to jdk env
   if [ -n "${visualvm_jdkhome}" ] && [ -d "${visualvm_jdkhome}" ] && [ -f "${visualvm_jdkhome}/bin/java" ]; then
     : # No-Op
@@ -90,7 +90,7 @@ elif [ -f "$progdir"/../etc/visualvm.conf ] ; then
     . "$progdir"/../etc/visualvm.conf
 fi
 
-set_jdk_java_home_from_conf
+set_jdk_java_home
 
 export DEFAULT_USERDIR_ROOT