ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [07/16] incubator-ignite git commit: # sprint-2 fixed assert
Date Mon, 16 Mar 2015 10:26:49 GMT
# sprint-2 fixed assert


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

Branch: refs/heads/ignite-sql-tests
Commit: f3c866f1d0986a9492124c315ceb92766c008199
Parents: b3d5eb6
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Mar 16 11:17:25 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Mar 16 11:17:25 2015 +0300

----------------------------------------------------------------------
 .../cache/query/continuous/CacheContinuousQueryManager.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f3c866f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index 0d76c27..8ee44ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -538,6 +538,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
 
         /**
          * @param cfg Listener configuration.
+         * @param onStart {@code True} if executed on cache start.
          */
         private JCacheQuery(CacheEntryListenerConfiguration cfg, boolean onStart) {
             this.cfg = cfg;
@@ -596,9 +597,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
         void cancel() throws IgniteCheckedException {
             UUID routineId0 = routineId;
 
-            assert routineId0 != null;
-
-            cctx.kernalContext().continuous().stopRoutine(routineId0).get();
+            if (routineId0 != null)
+                cctx.kernalContext().continuous().stopRoutine(routineId0).get();
 
             cctx.config().removeCacheEntryListenerConfiguration(cfg);
         }


Mime
View raw message