From d2d18606f8e1ab95599a8704d0a713464bd366ed Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Wed, 26 Jan 2011 18:13:46 +0200
Subject: Add the location of the 64-bit jvm.dll

---
 jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'jvmfwk')

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 81355dda210c..02f6d0058cf8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -69,7 +69,9 @@ char const* const* SunInfo::getRuntimePaths(int * size)
 #if defined(WNT)
         "/bin/client/jvm.dll",
         "/bin/hotspot/jvm.dll",
-        "/bin/classic/jvm.dll"
+        "/bin/classic/jvm.dll",
+        // The 64-bit JRE has the jvm in bin/server
+        "/bin/server/jvm.dll"
 #elif defined(OS2)
         "/bin/classic/jvm.dll",
 #elif UNX
-- 
cgit v1.2.3