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 407931864E for ; Fri, 17 Jul 2015 19:49:34 +0000 (UTC) Received: (qmail 59933 invoked by uid 500); 17 Jul 2015 19:49:34 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 59901 invoked by uid 500); 17 Jul 2015 19:49:34 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 59892 invoked by uid 99); 17 Jul 2015 19:49:34 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jul 2015 19:49:34 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id AAF7E185F3B for ; Fri, 17 Jul 2015 19:49:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id VEYbGbwTg0u5 for ; Fri, 17 Jul 2015 19:49:23 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 3BDC02160A for ; Fri, 17 Jul 2015 19:49:23 +0000 (UTC) Received: (qmail 59278 invoked by uid 99); 17 Jul 2015 19:49:23 -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, 17 Jul 2015 19:49:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ED19BE33C9; Fri, 17 Jul 2015 19:49:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 17 Jul 2015 19:49:23 -0000 Message-Id: <18845e53ce8a4dd291ed270c21d6de9c@git.apache.org> In-Reply-To: <7ee78c0e55ce40dbaf2c4b647df7c608@git.apache.org> References: <7ee78c0e55ce40dbaf2c4b647df7c608@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/50] [abbrv] incubator-ignite git commit: # More info in asserts. # More info in asserts. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f5a09f4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f5a09f4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f5a09f4d Branch: refs/heads/ignite-884 Commit: f5a09f4d1b2e912b2de25ffc669ca205d34ad0ce Parents: aa2d7cb Author: sboikov Authored: Tue Jul 14 11:39:29 2015 +0300 Committer: sboikov Committed: Tue Jul 14 11:39:29 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheContext.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5a09f4d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index eb813c3..aec08c6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -533,7 +533,7 @@ public class GridCacheContext implements Externalizable { public void incrementPublicSize(GridCacheMapEntry e) { assert deferredDelete(); assert e != null; - assert !e.isInternal(); + assert !e.isInternal() : e; cache.map().incrementSize(e); @@ -551,7 +551,7 @@ public class GridCacheContext implements Externalizable { public void decrementPublicSize(GridCacheMapEntry e) { assert deferredDelete(); assert e != null; - assert !e.isInternal(); + assert !e.isInternal() : e; cache.map().decrementSize(e); @@ -765,7 +765,7 @@ public class GridCacheContext implements Externalizable { * @return Partition topology. */ public GridDhtPartitionTopology topology() { - assert isNear() || isDht() || isColocated() || isDhtAtomic(); + assert isNear() || isDht() || isColocated() || isDhtAtomic() : cache; return isNear() ? near().dht().topology() : dht().topology(); } @@ -774,7 +774,7 @@ public class GridCacheContext implements Externalizable { * @return Topology version future. */ public GridDhtTopologyFuture topologyVersionFuture() { - assert isNear() || isDht() || isColocated() || isDhtAtomic(); + assert isNear() || isDht() || isColocated() || isDhtAtomic() : cache; GridDhtTopologyFuture fut = null; @@ -1599,9 +1599,9 @@ public class GridCacheContext implements Externalizable { */ public void onDeferredDelete(GridCacheEntryEx entry, GridCacheVersion ver) { assert entry != null; - assert !Thread.holdsLock(entry); + assert !Thread.holdsLock(entry) : entry; assert ver != null; - assert deferredDelete(); + assert deferredDelete() : cache; cache.onDeferredDelete(entry, ver); } @@ -1759,7 +1759,7 @@ public class GridCacheContext implements Externalizable { * @throws IgniteCheckedException If failed. */ public CacheObject fromOffheap(long valPtr, boolean tmp) throws IgniteCheckedException { - assert config().getMemoryMode() == OFFHEAP_TIERED || config().getMemoryMode() == OFFHEAP_VALUES; + assert config().getMemoryMode() == OFFHEAP_TIERED || config().getMemoryMode() == OFFHEAP_VALUES : cacheCfg; assert valPtr != 0; return ctx.cacheObjects().toCacheObject(this, valPtr, tmp);