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 672DE19E0C for ; Thu, 28 Apr 2016 13:07:04 +0000 (UTC) Received: (qmail 86544 invoked by uid 500); 28 Apr 2016 13:07:04 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 86507 invoked by uid 500); 28 Apr 2016 13:07:04 -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 86498 invoked by uid 99); 28 Apr 2016 13:07:04 -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, 28 Apr 2016 13:07:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E760DDFDCF; Thu, 28 Apr 2016 13:07:03 +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: <3727a0b22ec14ce2ae6fc1c145622cc4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-db-x-10884 Date: Thu, 28 Apr 2016 13:07:03 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-db-x-10884 5083e05cd -> 3f67466c9 Merge remote-tracking branch 'remotes/origin/master' into ignite-db-x-10884 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3f67466c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3f67466c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3f67466c Branch: refs/heads/ignite-db-x-10884 Commit: 3f67466c9449ac368032d5b48491db56344b54f6 Parents: 5083e05 Author: sboikov Authored: Thu Apr 28 16:07:01 2016 +0300 Committer: sboikov Committed: Thu Apr 28 16:07:01 2016 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtPartitionTopologyImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3f67466c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java index 241d3ac..0e206f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java @@ -703,7 +703,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { if (updateSeq) this.updateSeq.incrementAndGet(); - create = true; + created = true; if (log.isDebugEnabled()) log.debug("Created local partition: " + loc);