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 65DED200B25 for ; Wed, 8 Jun 2016 13:59:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 64622160A5F; Wed, 8 Jun 2016 11:59:00 +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 AAA0C160A5C for ; Wed, 8 Jun 2016 13:58:59 +0200 (CEST) Received: (qmail 30431 invoked by uid 500); 8 Jun 2016 11:58:58 -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 30422 invoked by uid 99); 8 Jun 2016 11:58:58 -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; Wed, 08 Jun 2016 11:58:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A61B3DFC74; Wed, 8 Jun 2016 11:58:58 +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: <53d599bf16874e2e84d7e56338f99922@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-114 Date: Wed, 8 Jun 2016 11:58:58 +0000 (UTC) archived-at: Wed, 08 Jun 2016 11:59:00 -0000 Repository: ignite Updated Branches: refs/heads/ignite-114 84a9161e9 -> a4c56455c ignite-114 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4c56455 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4c56455 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4c56455 Branch: refs/heads/ignite-114 Commit: a4c56455c486ebe0a16834addb67f62bd49338d8 Parents: 84a9161 Author: sboikov Authored: Wed Jun 8 14:58:50 2016 +0300 Committer: sboikov Committed: Wed Jun 8 14:58:50 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/transactions/IgniteTxHandler.java | 3 +-- .../processors/cache/transactions/IgniteTxLocalAdapter.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a4c56455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index e6cece4..93c0389 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -29,7 +29,6 @@ import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo; -import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException; import org.apache.ignite.internal.processors.cache.GridCacheMessage; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.KeyCacheObject; @@ -75,7 +74,7 @@ import org.jetbrains.annotations.Nullable; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.UTILITY_CACHE_POOL; -import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; +import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled; import static org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishFuture.FINISH_NEAR_ONE_PHASE_SINCE; import static org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx.FinalizationStatus.USER_FINISH; http://git-wip-us.apache.org/repos/asf/ignite/blob/a4c56455/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index f1a2bc0..28ecda5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -1986,7 +1986,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter needReadVer, singleRmv, hasFilters, - (entryProcessor != null || cacheCtx.config().isLoadPreviousValue()) && !skipStore, + /*read through*/(entryProcessor != null || cacheCtx.config().isLoadPreviousValue()) && !skipStore, retval, keepBinary); }