Return-Path: 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 3184E200BC7 for ; Fri, 25 Nov 2016 13:41:36 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 30178160B01; Fri, 25 Nov 2016 12:41:36 +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 78DA5160AF6 for ; Fri, 25 Nov 2016 13:41:35 +0100 (CET) Received: (qmail 84782 invoked by uid 500); 25 Nov 2016 12:41:34 -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 84773 invoked by uid 99); 25 Nov 2016 12:41:34 -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; Fri, 25 Nov 2016 12:41:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6EBBEF0DBF; Fri, 25 Nov 2016 12:41:34 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: test Date: Fri, 25 Nov 2016 12:41:34 +0000 (UTC) archived-at: Fri, 25 Nov 2016 12:41:36 -0000 Repository: ignite Updated Branches: refs/heads/ignite-binary-offheap [created] 2156e1610 test Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2156e161 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2156e161 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2156e161 Branch: refs/heads/ignite-binary-offheap Commit: 2156e16100ec02bfe17ee3802bc57b09414817fa Parents: 7b8d530 Author: sboikov Authored: Fri Nov 25 15:41:23 2016 +0300 Committer: sboikov Committed: Fri Nov 25 15:41:23 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/cache/GridCacheMapEntry.java | 2 ++ .../processors/cache/binary/CacheObjectBinaryProcessorImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2156e161/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index aec28bb..9494f10 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -2813,6 +2813,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme ", ptr=" + offHeapPointer() + ']'); } + assert obsolete(); + clearIndex(val); releaseSwap(); http://git-wip-us.apache.org/repos/asf/ignite/blob/2156e161/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index 568a4da..03efca1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -445,7 +445,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm byte type = GridUnsafe.getByte(ptr++); if (type != CacheObject.TYPE_BYTE_ARR) { - assert size > 0 : size; + assert size > 0 : "Invalid size [size=" + size + ", type=" + type + ']'; BinaryInputStream in = new BinaryOffheapInputStream(ptr, size, forceHeap);