You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/20 17:05:24 UTC

[08/23] incubator-ignite git commit: #ignite-1087: fix test.

#ignite-1087: fix test.


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

Branch: refs/heads/ignite-1087
Commit: 18e4de6b604d3a0ab9a427a43bc3e4c9ff546cfd
Parents: 2c2def0
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 6 11:11:24 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 6 11:11:24 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/closure/GridClosureProcessor.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18e4de6b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
index 1eb53ee..02b14a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
@@ -415,7 +415,9 @@ public class GridClosureProcessor extends GridProcessorAdapter {
 
             ctx.task().setThreadContext(TC_SUBGRID, nodes);
             ctx.task().setThreadContext(TC_AFFINITY_KEY, affKey0);
-            ctx.task().setThreadContext(TC_AFFINITY_CACHE, cacheName);
+
+            if (cacheName != null)
+                ctx.task().setThreadContext(TC_AFFINITY_CACHE, cacheName);
 
             return ctx.task().execute(new T5(node, job), null, false);
         }
@@ -449,7 +451,9 @@ public class GridClosureProcessor extends GridProcessorAdapter {
 
             ctx.task().setThreadContext(TC_SUBGRID, nodes);
             ctx.task().setThreadContext(TC_AFFINITY_KEY, affKey0);
-            ctx.task().setThreadContext(TC_AFFINITY_CACHE, cacheName);
+
+            if (cacheName != null)
+                ctx.task().setThreadContext(TC_AFFINITY_CACHE, cacheName);
 
             return ctx.task().execute(new T4(node, job), null, false);
         }