You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/11/21 12:10:05 UTC
[11/47] ignite git commit: IGNITE-5343 .NET: Work with JNI directly,
get rid of C++ layer Fix ConsoleWriter lifetime
IGNITE-5343 .NET: Work with JNI directly, get rid of C++ layer
Fix ConsoleWriter lifetime
This closes #2985
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cdb43d84
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cdb43d84
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cdb43d84
Branch: refs/heads/ignite-zk
Commit: cdb43d843f3b8fa10a3198c8b82c4967171765be
Parents: d272a0b
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Tue Nov 14 22:50:57 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Tue Nov 14 22:50:57 2017 +0300
----------------------------------------------------------------------
.../Apache.Ignite.Core/Impl/Unmanaged/Jni/ConsoleWriter.cs | 7 +++++++
.../dotnet/Apache.Ignite.Core/Impl/Unmanaged/Jni/Jvm.cs | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cdb43d84/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/Jni/ConsoleWriter.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/Jni/ConsoleWriter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/Jni/ConsoleWriter.cs
index ef4be1e..b1baf79 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/Jni/ConsoleWriter.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/Jni/ConsoleWriter.cs
@@ -36,5 +36,12 @@ namespace Apache.Ignite.Core.Impl.Unmanaged.Jni
var target = isError ? Console.Error : Console.Out;
target.Write(message);
}
+
+ /** <inheritdoc /> */
+ public override object InitializeLifetimeService()
+ {
+ // Ensure that cross-AppDomain reference lives forever.
+ return null;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cdb43d84/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/Jni/Jvm.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/Jni/Jvm.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/Jni/Jvm.cs
index 10c7468..55331c7 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/Jni/Jvm.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/Jni/Jvm.cs
@@ -49,7 +49,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged.Jni
/** Callbacks. */
private readonly Callbacks _callbacks;
- /** Static instamce */
+ /** Static instance */
private static volatile Jvm _instance;
/** Sync. */