Return-Path: <commits-return-115268-archive-asf-public=cust-asf.ponee.io@ignite.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 2F114200D6A
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue, 21 Nov 2017 13:09:59 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 2DF70160C1B; Tue, 21 Nov 2017 12:09:59 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 3A4CE160C1D
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 21 Nov 2017 13:09:58 +0100 (CET)
Received: (qmail 25254 invoked by uid 500); 21 Nov 2017 12:09:57 -0000
Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ignite.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ignite.apache.org>
List-Post: <mailto:commits@ignite.apache.org>
List-Id: <commits.ignite.apache.org>
Reply-To: dev@ignite.apache.org
Delivered-To: mailing list commits@ignite.apache.org
Received: (qmail 25094 invoked by uid 99); 21 Nov 2017 12:09:57 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Nov 2017 12:09:57 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 06C87F5E5C; Tue, 21 Nov 2017 12:09:55 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sboikov@apache.org
To: commits@ignite.apache.org
Date: Tue, 21 Nov 2017 12:10:05 -0000
Message-Id: <7c40ecc2bdc844a0801e5619bc88973e@git.apache.org>
In-Reply-To: <a256a704e814407eacdb11be84d1a2e4@git.apache.org>
References: <a256a704e814407eacdb11be84d1a2e4@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [11/47] ignite git commit: IGNITE-5343 .NET: Work with JNI directly,
 get rid of C++ layer Fix ConsoleWriter lifetime
archived-at: Tue, 21 Nov 2017 12:09:59 -0000

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 <ptupitsyn@apache.org>
Authored: Tue Nov 14 22:50:57 2017 +0300
Committer: Pavel Tupitsyn <ptupitsyn@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. */