Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7F541185C4 for ; Thu, 22 Oct 2015 09:26:55 +0000 (UTC) Received: (qmail 66944 invoked by uid 500); 22 Oct 2015 09:26:55 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 66885 invoked by uid 500); 22 Oct 2015 09:26:55 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 65841 invoked by uid 99); 22 Oct 2015 09:26:54 -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; Thu, 22 Oct 2015 09:26:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7BCB2E13D0; Thu, 22 Oct 2015 09:26:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Thu, 22 Oct 2015 09:27:42 -0000 Message-Id: In-Reply-To: <9d4d1a7cfd0c49149f55244b156203a3@git.apache.org> References: <9d4d1a7cfd0c49149f55244b156203a3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [50/50] [abbrv] ignite git commit: IGNITE-1651: Finalization. IGNITE-1651: Finalization. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/03cbca56 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/03cbca56 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/03cbca56 Branch: refs/heads/ignite-1651 Commit: 03cbca56fa85adfe4150929420ab9739ab243af3 Parents: ec58b87 Author: vozerov-gridgain Authored: Thu Oct 22 12:25:35 2015 +0300 Committer: vozerov-gridgain Committed: Thu Oct 22 12:25:35 2015 +0300 ---------------------------------------------------------------------- .../Apache.Ignite.Core/Impl/Portable/PortableUserObject.cs | 2 +- .../dotnet/Apache.Ignite.Core/Impl/Portable/PortableUtils.cs | 2 +- .../Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/03cbca56/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUserObject.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUserObject.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUserObject.cs index 2bf5ab8..9df180d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUserObject.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUserObject.cs @@ -186,7 +186,7 @@ namespace Apache.Ignite.Core.Impl.Portable { IPortableStream stream = new PortableHeapStream(_data); - stream.Seek(_offset + PortableUtils.OffsetRawOff, SeekOrigin.Begin); + stream.Seek(_offset + PortableUtils.OffsetRaw, SeekOrigin.Begin); int rawDataOffset = stream.ReadInt(); http://git-wip-us.apache.org/repos/asf/ignite/blob/03cbca56/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUtils.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUtils.cs index 6d07757..15466d5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUtils.cs @@ -66,7 +66,7 @@ namespace Apache.Ignite.Core.Impl.Portable public const int OffsetLen = 11; /** Offset: raw data offset. */ - public const int OffsetRawOff = 15; + public const int OffsetRaw = 15; /** Type: object. */ public const byte TypeObject = HdrFull; http://git-wip-us.apache.org/repos/asf/ignite/blob/03cbca56/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs index 6146362..5a66a0f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs @@ -1227,8 +1227,8 @@ namespace Apache.Ignite.Core.Impl.Portable // Calculate and write length. int len = _stream.Position - pos; - _stream.Seek(pos + PU.OffsetLen, SeekOrigin.Begin); - + _stream.WriteInt(pos + PU.OffsetLen, len); + if (_curRawPos != 0) _stream.WriteInt(pos + PU.OffsetRaw, (int)(_curRawPos - pos)); else