You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/02/26 14:16:35 UTC
[17/35] ignite git commit: IGNITE-2684 fixes
IGNITE-2684 fixes
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3cf654b8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3cf654b8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3cf654b8
Branch: refs/heads/ignite-2407
Commit: 3cf654b80b16b0f9da1302dc98858425e0a3ce45
Parents: 41a8e7e
Author: Anton Vinogradov <av...@apache.org>
Authored: Sat Feb 20 14:30:29 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Feb 24 13:36:14 2016 +0300
----------------------------------------------------------------------
.../datastreamer/DataStreamerImpl.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3cf654b8/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 f832e4e..905d7b2 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<K, V> implements IgniteDataStreamer<K, V>, Delayed
Map<ClusterNode, Collection<DataStreamerEntry>> 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<K, V> implements IgniteDataStreamer<K, V>, 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<K, V> implements IgniteDataStreamer<K, V>, 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<Object, Object> cache = ctx.cache().internalCache(cacheName);