ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject incubator-ignite git commit: # IGNITE-143 - Fixing tests
Date Fri, 13 Feb 2015 02:17:54 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-143 8230c8c74 -> 88e6ff5e6


# IGNITE-143 - Fixing tests


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

Branch: refs/heads/ignite-143
Commit: 88e6ff5e671fb296b6fb3f34bac1b8a733fb6a3b
Parents: 8230c8c
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Thu Feb 12 18:17:49 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Thu Feb 12 18:17:49 2015 -0800

----------------------------------------------------------------------
 .../continuous/CacheContinuousQueryManager.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88e6ff5e/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 bebac13..1b4af35 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
@@ -125,14 +125,6 @@ public class CacheContinuousQueryManager<K, V> extends GridCacheManagerAdapter<K
         assert e != null;
         assert key != null;
 
-        boolean hasNewVal = newVal != null || (newBytes != null && !newBytes.isNull());
-        boolean hasOldVal = oldVal != null || (oldBytes != null && !oldBytes.isNull());
-
-        if (!hasNewVal && !hasOldVal)
-            return;
-
-        EventType evtType = !hasNewVal ? REMOVED : !hasOldVal ? CREATED : UPDATED;
-
         ConcurrentMap<UUID, CacheContinuousQueryListener<K, V>> lsnrCol;
 
         if (e.isInternal())
@@ -143,6 +135,14 @@ public class CacheContinuousQueryManager<K, V> extends GridCacheManagerAdapter<K
         if (F.isEmpty(lsnrCol))
             return;
 
+        boolean hasNewVal = newVal != null || (newBytes != null && !newBytes.isNull());
+        boolean hasOldVal = oldVal != null || (oldBytes != null && !oldBytes.isNull());
+
+        if (!hasNewVal && !hasOldVal)
+            return;
+
+        EventType evtType = !hasNewVal ? REMOVED : !hasOldVal ? CREATED : UPDATED;
+
         boolean initialized = false;
 
         boolean primary = cctx.affinity().primary(cctx.localNode(), key, -1);


Mime
View raw message