IGNITE-8521 Do not attempt to unregister continuous query if query ID is null


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

Branch: refs/heads/ignite-5789-1
Commit: 436d1230efff5000decad30cfbc0a79b151f3e16
Parents: d0e26be
Author: Alexey Goncharuk <[email protected]>
Authored: Mon May 21 15:13:37 2018 +0300
Committer: Alexey Goncharuk <[email protected]>
Committed: Mon May 21 15:13:37 2018 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/436d1230/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 19225f8..55c44b4 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
@@ -703,7 +703,8 @@ public class CacheContinuousQueryManager extends 
GridCacheManagerAdapter {
         catch (IgniteCheckedException e) {
             log.warning("Failed to start continuous query.", e);
 
-            cctx.kernalContext().continuous().stopRoutine(id);
+            if (id != null)
+                cctx.kernalContext().continuous().stopRoutine(id);
 
             throw new IgniteCheckedException("Failed to start continuous 
query.", e);
         }

Reply via email to