Return-Path: 
 <commits-return-71019-apmail-ignite-commits-archive=ignite.apache.org@ignite.incubator.apache.org>
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 20D5418A9C
	for <apmail-ignite-commits-archive@minotaur.apache.org>;
 Wed, 19 Aug 2015 14:49:18 +0000 (UTC)
Received: (qmail 3533 invoked by uid 500); 19 Aug 2015 14:49:18 -0000
Delivered-To: apmail-ignite-commits-archive@ignite.apache.org
Received: (qmail 3500 invoked by uid 500); 19 Aug 2015 14:49:18 -0000
Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ignite.incubator.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ignite.incubator.apache.org>
List-Post: <mailto:commits@ignite.incubator.apache.org>
List-Id: <commits.ignite.incubator.apache.org>
Reply-To: dev@ignite.incubator.apache.org
Delivered-To: mailing list commits@ignite.incubator.apache.org
Received: (qmail 3491 invoked by uid 99); 19 Aug 2015 14:49:18 -0000
Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Aug 2015 14:49:18 +0000
Received: from localhost (localhost [127.0.0.1])
	by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org)
 with ESMTP id 901661AA797
	for <commits@ignite.apache.org>; Wed, 19 Aug 2015 14:49:17 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org
X-Spam-Flag: NO
X-Spam-Score: 0.795
X-Spam-Level: 
X-Spam-Status: No, score=0.795 tagged_above=-999 required=6.31
	tests=[KAM_ASCII_DIVIDERS=0.8, RP_MATCHES_RCVD=-0.006,
	URIBL_BLOCKED=0.001] autolearn=disabled
Received: from mx1-us-east.apache.org ([10.40.0.8])
	by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new,
 port 10024)
	with ESMTP id 3w0o4GU2GuGU for <commits@ignite.apache.org>;
	Wed, 19 Aug 2015 14:49:10 +0000 (UTC)
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with
 SMTP id 48CFE42F2A
	for <commits@ignite.incubator.apache.org>;
 Wed, 19 Aug 2015 14:49:10 +0000 (UTC)
Received: (qmail 3451 invoked by uid 99); 19 Aug 2015 14:49:09 -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, 19 Aug 2015 14:49:09 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 51C5EDFA25; Wed, 19 Aug 2015 14:49:09 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sboikov@apache.org
To: commits@ignite.incubator.apache.org
Message-Id: <48e42f54659a4da093a248e037d93182@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: incubator-ignite git commit: # ignite-1265 fix prepare future
Date: Wed, 19 Aug 2015 14:49:09 +0000 (UTC)

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-1.3.3-p3 7f928dc04 -> 00417376c


# ignite-1265 fix prepare future


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00417376
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00417376
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00417376

Branch: refs/heads/ignite-1.3.3-p3
Commit: 00417376c829c8a01cfc6ccbe5d328f01e23bf45
Parents: 7f928dc
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Aug 19 17:48:47 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Aug 19 17:48:47 2015 +0300

----------------------------------------------------------------------
 .../distributed/dht/GridDhtTxPrepareFuture.java | 41 ++++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00417376/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 08d02f2..cd51b7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -297,34 +297,33 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
                 if (hasFilters || retVal || txEntry.op() == DELETE || txEntry.op() == TRANSFORM) {
                     CacheObject val;
 
-                    if (!txEntry.hasValue()) {
-                        cached.unswap(retVal);
+                    cached.unswap(retVal);
 
-                        boolean readThrough = (retVal || hasFilters) &&
-                            cacheCtx.config().isLoadPreviousValue() &&
-                            !txEntry.skipStore();
+                    boolean readThrough = (retVal || hasFilters) &&
+                        cacheCtx.config().isLoadPreviousValue() &&
+                        !txEntry.skipStore();
 
-                        val = cached.innerGet(
-                            tx,
-                            /*swap*/true,
-                            readThrough,
-                            /*fail fast*/false,
-                            /*unmarshal*/true,
-                            /*metrics*/retVal,
-                            /*event*/retVal,
-                            /*tmp*/false,
-                            null,
-                            null,
-                            null,
-                            null);
-                    }
-                    else
-                        val = txEntry.value();
+                    val = cached.innerGet(
+                        tx,
+                        /*swap*/true,
+                        readThrough,
+                        /*fail fast*/false,
+                        /*unmarshal*/true,
+                        /*metrics*/retVal,
+                        /*event*/retVal,
+                        /*tmp*/false,
+                        null,
+                        null,
+                        null,
+                        null);
 
                     if (retVal || txEntry.op() == TRANSFORM) {
                         if (!F.isEmpty(txEntry.entryProcessors())) {
                             invoke = true;
 
+                            if (txEntry.hasValue())
+                                val = txEntry.value();
+
                             KeyCacheObject key = txEntry.key();
 
                             Object procRes = null;