This is an automated email from the ASF dual-hosted git repository. leginee pushed a commit to branch win10-msvc-trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 6767d0277169a25b27ee9a73512a28a30e007e20 Author: Peter Kovacs <[email protected]> AuthorDate: Tue Aug 25 09:28:16 2026 +0200 jvmfwk: look for jre/bin/server/jvm.dll on Windows The Windows runtime path list probes client, hotspot, classic and jrockit -- never server. A 64 bit HotSpot JDK ships ONLY bin/server/jvm.dll; there is no client VM. So on x64 the list could not match anything and Java was never detected, which is what "the build doesn't automatically detect Java" meant. 32 bit JDKs still carry a client VM, which is why x86 never showed it. The UNX branch of the same array already lists both client and server. Verified on the x64 build: forcing a JVM start now loads C:\Program Files\Eclipse Adoptium\jdk-8.0.452.9-hotspot\jre\bin\server\jvm.dll where nothing loaded before. server goes second, after client, so 32 bit JREs keep their existing resolution order. The other /bin/client/jvm.dll in each file is in the OS2 branch and is left alone. This is the third instance of the same assumption; set_soenv.in had the other two, in the PATH blocks that add jre/bin/client but never jre/bin/server. Co-Authored-By: Claude Opus 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01VrM7EMKgiuyVcCUe9nSbZR --- main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 1 + main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 1 + 2 files changed, 2 insertions(+) diff --git a/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index ba6f52d4a6..686f0dd52b 100644 --- a/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -60,6 +60,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size) static char const* ar[]= { #if defined(WNT) "/bin/client/jvm.dll", + "/bin/server/jvm.dll", // 64 bit HotSpot ships only this one "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll", "/bin/jrockit/jvm.dll" diff --git a/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index a0ecb25088..64df260a4b 100644 --- a/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -62,6 +62,7 @@ char const* const* SunInfo::getRuntimePaths(int * size) static char const* ar[]= { #if defined(WNT) "/bin/client/jvm.dll", + "/bin/server/jvm.dll", // 64 bit HotSpot ships only this one "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll", "/bin/jrockit/jvm.dll"
