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 CB36618AB0 for ; Mon, 30 Nov 2015 17:00:30 +0000 (UTC) Received: (qmail 24600 invoked by uid 500); 30 Nov 2015 17:00:30 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 24519 invoked by uid 500); 30 Nov 2015 17:00:30 -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 24495 invoked by uid 99); 30 Nov 2015 17:00:30 -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; Mon, 30 Nov 2015 17:00:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5966CE09AF; Mon, 30 Nov 2015 17:00:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Mon, 30 Nov 2015 17:00:31 -0000 Message-Id: <4315a8e569d24df4a1b72e8bf6fe87b7@git.apache.org> In-Reply-To: <06f1e8a3ae7f4613b999430dbbc0f075@git.apache.org> References: <06f1e8a3ae7f4613b999430dbbc0f075@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/12] ignite git commit: ignite-1.5 Handle marshal/unmarshal prevVals in GridDhtAtomicUpdateRequest. ignite-1.5 Handle marshal/unmarshal prevVals in GridDhtAtomicUpdateRequest. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0fcc1d18 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0fcc1d18 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0fcc1d18 Branch: refs/heads/ignite-1.5.1 Commit: 0fcc1d18f7d403588e2f018458b1d16c81ed131c Parents: c5304a9 Author: sboikov Authored: Mon Nov 30 15:15:06 2015 +0300 Committer: sboikov Committed: Mon Nov 30 15:15:06 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0fcc1d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index b3155a7..4f15fa1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -647,6 +647,8 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid prepareMarshalCacheObjects(nearVals, cctx); + prepareMarshalCacheObjects(prevVals, cctx); + if (forceTransformBackups) { // force addition of deployment info for entry processors if P2P is enabled globally. if (!addDepInfo && ctx.deploymentEnabled()) @@ -674,6 +676,8 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid finishUnmarshalCacheObjects(nearVals, cctx, ldr); + finishUnmarshalCacheObjects(prevVals, cctx, ldr); + if (forceTransformBackups) { entryProcessors = unmarshalCollection(entryProcessorsBytes, ctx, ldr);