IGNITE-45 - 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/36c43185 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36c43185 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36c43185 Branch: refs/heads/ignite-541 Commit: 36c43185aaecc2965abacd9dffbff32d8c5dcb1b Parents: 64e6544 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Mar 20 15:53:06 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Mar 20 15:53:06 2015 -0700 ---------------------------------------------------------------------- .../continuous/CacheContinuousQueryManager.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/36c43185/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 adf62f2..a048581 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 @@ -570,9 +570,16 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { locLsnrImpl, log); - IgniteCacheEntryEventFilter rmtFilter = new JCacheQueryRemoteFilter( - cfg.getCacheEntryEventFilterFactory() != null ? (IgniteCacheEntryEventFilter)cfg.getCacheEntryEventFilterFactory().create() : null, - types); + CacheEntryEventFilter fltr = null; + + if (cfg.getCacheEntryEventFilterFactory() != null) { + fltr = (CacheEntryEventFilter) cfg.getCacheEntryEventFilterFactory().create(); + + if (!(fltr instanceof Serializable)) + throw new IgniteCheckedException("Cache entry event filter must implement java.io.Serializable: " + fltr); + } + + IgniteCacheEntryEventFilter rmtFilter = new JCacheQueryRemoteFilter(fltr, types); routineId = executeQuery0( locLsnr, @@ -690,7 +697,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { private static final long serialVersionUID = 0L; /** */ - private IgniteCacheEntryEventFilter impl; + private CacheEntryEventFilter impl; /** */ private byte types; @@ -710,7 +717,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @param impl Filter. * @param types Types. */ - JCacheQueryRemoteFilter(IgniteCacheEntryEventFilter impl, byte types) { + JCacheQueryRemoteFilter(CacheEntryEventFilter impl, byte types) { assert types != 0; this.impl = impl;
