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 46D5618DC7 for ; Sat, 20 Feb 2016 11:30:42 +0000 (UTC) Received: (qmail 42599 invoked by uid 500); 20 Feb 2016 11:30:42 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 42566 invoked by uid 500); 20 Feb 2016 11:30:42 -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 42556 invoked by uid 99); 20 Feb 2016 11:30:42 -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; Sat, 20 Feb 2016 11:30:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47F20E0104; Sat, 20 Feb 2016 11:30:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-2648 Date: Sat, 20 Feb 2016 11:30:41 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-1.5.7 03e5d9c6e -> 80dd057a0 IGNITE-2648 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/80dd057a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/80dd057a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/80dd057a Branch: refs/heads/ignite-1.5.7 Commit: 80dd057a03374cc10280d0e9707ecbf6b609e880 Parents: 03e5d9c Author: Anton Vinogradov Authored: Sat Feb 20 14:30:29 2016 +0300 Committer: Anton Vinogradov Committed: Sat Feb 20 14:30:29 2016 +0300 ---------------------------------------------------------------------- .../datastreamer/DataStreamerImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/80dd057a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java index 048fe4d..7564376 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java @@ -628,7 +628,7 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed Map> mappings = new HashMap<>(); - boolean initPda = ctx.deploy().enabled() && cacheObjCtx.addDeploymentInfo() && jobPda == null; + boolean initPda = ctx.deploy().enabled() && jobPda == null; AffinityTopologyVersion topVer = ctx.cache().context().exchange().readyAffinityVersion(); @@ -641,9 +641,12 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed assert key != null; if (initPda) { - jobPda = new DataStreamerPda(key.value(cacheObjCtx, false), - entry.getValue() != null ? entry.getValue().value(cacheObjCtx, false) : null, - rcvr); + if (cacheObjCtx.addDeploymentInfo()) + jobPda = new DataStreamerPda(key.value(cacheObjCtx, false), + entry.getValue() != null ? entry.getValue().value(cacheObjCtx, false) : null, + rcvr); + else if (rcvr != null) + jobPda = new DataStreamerPda(rcvr); initPda = false; } @@ -1304,12 +1307,10 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed GridDeployment dep = null; GridPeerDeployAware jobPda0 = null; - if (ctx.deploy().enabled() && cacheObjCtx.addDeploymentInfo()) { - try { - jobPda0 = jobPda; - - assert jobPda0 != null; + jobPda0 = jobPda; + if (ctx.deploy().enabled() && jobPda0 != null) { + try { dep = ctx.deploy().deploy(jobPda0.deployClass(), jobPda0.classLoader()); GridCacheAdapter cache = ctx.cache().internalCache(cacheName);