You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/11/23 09:46:26 UTC

[23/30] ignite git commit: Fixed GridEventConsumeSelfTest.

Fixed GridEventConsumeSelfTest.


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

Branch: refs/heads/ignite-1753-1282
Commit: 15877a8baf8ab32efb2e3f945d7a993205ab11ae
Parents: 13e11b3
Author: Tikhonov Nikolay <ti...@gmail.com>
Authored: Sun Nov 22 13:43:59 2015 +0300
Committer: Tikhonov Nikolay <ti...@gmail.com>
Committed: Sun Nov 22 13:43:59 2015 +0300

----------------------------------------------------------------------
 .../processors/continuous/GridContinuousProcessor.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/15877a8b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index c07cc13..e218790 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -210,7 +210,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
                         if (msg.errs().isEmpty()) {
                             LocalRoutineInfo routine = locInfos.get(msg.routineId());
 
-                            if (routine != null) {
+                            if (routine != null && routine.handler().isForQuery()) {
                                 try {
                                     Map<Integer, Long> cntrs = msg.updateCounters();
 
@@ -889,7 +889,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
         }
 
         try {
-            if (ctx.cache() != null && ctx.cache().internalCache(hnd.cacheName()) != null) {
+            if (hnd.isForQuery() && ctx.cache() != null && ctx.cache().internalCache(hnd.cacheName()) != null) {
                 Map<Integer, Long> cntrs = ctx.cache().internalCache(hnd.cacheName())
                     .context().topology().updateCounters();
 
@@ -897,7 +897,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
             }
         }
         catch (Exception e) {
-            U.warn(log, "Failed to load partition counters.");
+            U.warn(log, "Failed to load partition counters.", e);
         }
 
         if (err != null)