ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject ignite git commit: IGNITE-2249 - Do not deserialize services on client node
Date Wed, 17 Feb 2016 07:35:56 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2249 63ae9f5b9 -> ffeda2842


IGNITE-2249 - Do not deserialize services on client node


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

Branch: refs/heads/ignite-2249
Commit: ffeda2842bb90ef7dcb8ff49289f81967575cdff
Parents: 63ae9f5
Author: Valentin Kulichenko <valentin.kulichenko@gmail.com>
Authored: Tue Feb 16 23:34:34 2016 -0800
Committer: Valentin Kulichenko <valentin.kulichenko@gmail.com>
Committed: Tue Feb 16 23:34:34 2016 -0800

----------------------------------------------------------------------
 .../cache/query/continuous/CacheContinuousQueryHandler.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ffeda284/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 c4dd6f1..0324e41 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
@@ -571,6 +571,8 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
 
         final GridCacheContext cctx = cacheContext(ctx);
 
+        Collection<CacheContinuousQueryEntry> entries0 = new ArrayList<>();
+
         for (CacheContinuousQueryEntry e : entries) {
             GridCacheDeploymentManager depMgr = cctx.deploy();
 
@@ -587,6 +589,8 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
 
             try {
                 e.unmarshal(cctx, ldr);
+
+                entries0.addAll(handleEvent(ctx, e));
             }
             catch (IgniteCheckedException ex) {
                 if (ignoreClassNotFound)
@@ -598,11 +602,6 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
 
         final IgniteCache cache = cctx.kernalContext().cache().jcache(cctx.name());
 
-        Collection<CacheContinuousQueryEntry> entries0 = new ArrayList<>();
-
-        for (CacheContinuousQueryEntry e : entries)
-            entries0.addAll(handleEvent(ctx, e));
-
         if (!entries0.isEmpty()) {
             Iterable<CacheEntryEvent<? extends K, ? extends V>> evts = F.viewReadOnly(entries0,
                 new C1<CacheContinuousQueryEntry, CacheEntryEvent<? extends K, ? extends
V>>() {


Mime
View raw message