IGNITE-5628 .NET: Fix jvm.dll lookup paths for JRE
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5093660d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5093660d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5093660d Branch: refs/heads/ignite-2.1.2-exchange Commit: 5093660d758ad4149d5cd135f3cad3dfee0ae6e4 Parents: c08849c Author: Pavel Tupitsyn <[email protected]> Authored: Mon Jul 3 17:58:47 2017 +0300 Committer: Pavel Tupitsyn <[email protected]> Committed: Mon Jul 3 17:58:47 2017 +0300 ---------------------------------------------------------------------- .../dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5093660d/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs index b024345..f3bdd2b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs @@ -46,7 +46,17 @@ namespace Apache.Ignite.Core.Impl private const string EnvJavaHome = "JAVA_HOME"; /** Lookup paths. */ - private static readonly string[] JvmDllLookupPaths = {@"jre\bin\server", @"jre\bin\default"}; + private static readonly string[] JvmDllLookupPaths = + { + // JRE paths + @"bin\server", + @"bin\client", + + // JDK paths + @"jre\bin\server", + @"jre\bin\client", + @"jre\bin\default" + }; /** Registry lookup paths. */ private static readonly string[] JreRegistryKeys =
