IGNITE-45 - Fixed compilation after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dab080d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dab080d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dab080d4 Branch: refs/heads/ignite-45 Commit: dab080d4b06233265c84c967c1bd70dbe8ed9c71 Parents: 42f3f2f Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Mar 17 19:51:32 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Mar 17 19:51:32 2015 -0700 ---------------------------------------------------------------------- .../cache/query/continuous/CacheContinuousQueryHandler.java | 6 ------ .../IgniteCacheStoreSessionWriteBehindAbstractTest.java | 9 +++------ 2 files changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab080d4/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 a50b668..cbfbecf 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 @@ -21,9 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.query.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.managers.deployment.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.query.*; @@ -159,9 +156,6 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { assert routineId != null; assert ctx != null; - if (ctx.cache().internalCache(cacheName) == null) - return false; - if (locLsnr != null) ctx.resource().injectGeneric(locLsnr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dab080d4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java index 408bd93..3953a32 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java @@ -22,7 +22,6 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.jetbrains.annotations.*; @@ -33,8 +32,6 @@ import javax.cache.integration.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; - /** * */ @@ -59,8 +56,8 @@ public abstract class IgniteCacheStoreSessionWriteBehindAbstractTest extends Ign } /** {@inheritDoc} */ - @Override protected CacheDistributionMode distributionMode() { - return PARTITIONED_ONLY; + @Override protected NearCacheConfiguration nearConfiguration() { + return null; } /** {@inheritDoc} */ @@ -79,7 +76,7 @@ public abstract class IgniteCacheStoreSessionWriteBehindAbstractTest extends Ign ccfg0.setWriteBehindFlushFrequency(60_000); ccfg0.setWriteBehindEnabled(true); - ccfg0.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); + ccfg0.setCacheStoreFactory(new TestStoreFactory()); CacheConfiguration ccfg1 = cacheConfiguration(gridName);
