IGNITE-45 - Fixed compilation after merge.

apache · Mar 18, 2015 · dab080d · dab080d
1 parent 42f3f2f
commit dab080d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/...apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/...apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -21,9 +21,6 @@
 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 @@ public CacheContinuousQueryHandler(
         assert routineId != null;
         assert ctx != null;
 
-        if (ctx.cache().internalCache(cacheName) == null)
-            return false;
-
         if (locLsnr != null)
             ctx.resource().injectGeneric(locLsnr);
 

diff --git a/...internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java b/...internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
@@ -22,7 +22,6 @@
 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 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() {
+    @Override protected NearCacheConfiguration nearConfiguration() {
-        return PARTITIONED_ONLY;
+        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);