Fix merge from 1.7.2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/77a9aaca Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/77a9aaca Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/77a9aaca Branch: refs/heads/master Commit: 77a9aaca1ff8673f30548ba4f4e806ac2bbdde51 Parents: 0b7512a Author: Pavel Tupitsyn <ptupit...@apache.org> Authored: Fri Sep 16 18:07:52 2016 +0300 Committer: Pavel Tupitsyn <ptupit...@apache.org> Committed: Fri Sep 16 18:07:52 2016 +0300 ---------------------------------------------------------------------- .../dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/77a9aaca/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs index ecc76f9..bea49da 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs @@ -21,6 +21,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; + using System.Globalization; using System.IO; using System.Runtime.InteropServices; using System.Threading; @@ -1116,6 +1117,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged if (_ignite != null && errDataLen > 0) { // Stream disposal intentionally omitted: IGNITE-1598 + // ReSharper disable once ExpressionIsAlwaysNull var stream = new PlatformRawMemory(errData, errDataLen).GetStream(); throw ExceptionUtils.GetException(_ignite, errCls, errMsg, stackTrace,
