ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [5/7] ignite git commit: IGNITE-2822 Fix for error in commit #da47901.
Date Thu, 07 Apr 2016 14:46:41 GMT
IGNITE-2822 Fix for error in commit #da47901.


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

Branch: refs/heads/ignite-2630
Commit: 196954f29c5ed96130f2e8706ff85797a7904b03
Parents: d09ef6c
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Apr 7 12:13:29 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Apr 7 12:13:29 2016 +0300

----------------------------------------------------------------------
 .../query/continuous/CacheContinuousQueryHandler.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/196954f2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index 3576424..16513b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -645,9 +645,11 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
         }
 
         // Initial query entry or evicted entry. These events should be fired immediately.
-        if (e.updateCounter() == -1L)
-            return F.<CacheEntryEvent<? extends K, ? extends V>>asList(
-                new CacheContinuousQueryEvent<K, V>(cache, cctx, e));
+        if (e.updateCounter() == -1L) {
+            return !e.isFiltered() ? F.<CacheEntryEvent<? extends K, ? extends V>>asList(
+                new CacheContinuousQueryEvent<K, V>(cache, cctx, e)) :
+                Collections.<CacheEntryEvent<? extends K, ? extends V>>emptyList();
+        }
 
         PartitionRecovery rec = getOrCreatePartitionRecovery(ctx, e.partition());
 
@@ -683,9 +685,8 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
                         }
                     }
                 }
-                else if (initUpdCntrs != null) {
+                else if (initUpdCntrs != null)
                     partCntr = initUpdCntrs.get(partId);
-                }
             }
 
             rec = new PartitionRecovery(ctx.log(getClass()), initTopVer0, partCntr);


Mime
View raw message