You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by is...@apache.org on 2019/04/18 14:26:43 UTC
[ignite] branch master updated: IGNITE-11766: Fix for OpenJDK Java
11 for Windows
This is an automated email from the ASF dual-hosted git repository.
isapego pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 0fad36d IGNITE-11766: Fix for OpenJDK Java 11 for Windows
0fad36d is described below
commit 0fad36de2c245f383f3a2900daa2895217ba88a7
Author: Igor Sapego <is...@apache.org>
AuthorDate: Thu Apr 18 17:25:31 2019 +0300
IGNITE-11766: Fix for OpenJDK Java 11 for Windows
This closes #6468
---
modules/platforms/cpp/jni/os/win/src/utils.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/modules/platforms/cpp/jni/os/win/src/utils.cpp b/modules/platforms/cpp/jni/os/win/src/utils.cpp
index 4d0c197..22b47dc 100644
--- a/modules/platforms/cpp/jni/os/win/src/utils.cpp
+++ b/modules/platforms/cpp/jni/os/win/src/utils.cpp
@@ -34,7 +34,8 @@ namespace ignite
namespace jni
{
const char* JAVA_HOME = "JAVA_HOME";
- const char* JAVA_DLL = "\\jre\\bin\\server\\jvm.dll";
+ const char* JAVA_DLL1 = "\\jre\\bin\\server\\jvm.dll";
+ const char* JAVA_DLL2 = "\\bin\\server\\jvm.dll";
const char* IGNITE_HOME = "IGNITE_HOME";
@@ -283,7 +284,12 @@ namespace ignite
if (!javaEnv.empty())
{
- std::string javaDll = javaEnv + JAVA_DLL;
+ std::string javaDll = javaEnv + JAVA_DLL1;
+
+ if (FileExists(javaDll))
+ return javaDll;
+
+ javaDll = javaEnv + JAVA_DLL2;
if (FileExists(javaDll))
return javaDll;