ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject ignite git commit: Fixed tests.
Date Tue, 22 Mar 2016 16:52:05 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2004 3192b7fa2 -> 1eaf5cfd7


Fixed tests.


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

Branch: refs/heads/ignite-2004
Commit: 1eaf5cfd745447a1e105313454ab2c5509380368
Parents: 3192b7f
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Tue Mar 22 14:03:42 2016 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Tue Mar 22 19:51:38 2016 +0300

----------------------------------------------------------------------
 .../query/continuous/CacheContinuousQueryManager.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1eaf5cfd/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 d93e775..2b3052f 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
@@ -600,7 +600,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
             false,
             false,
             loc,
-            keepBinary);
+            keepBinary,
+            false);
     }
 
     /**
@@ -639,6 +640,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
             true,
             notifyExisting,
             loc,
+            false,
             false);
     }
 
@@ -719,6 +721,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
      * @param internal Internal flag.
      * @param notifyExisting Notify existing flag.
      * @param loc Local flag.
+     * @param onStart Waiting topology exchange.
      * @return Continuous routine ID.
      * @throws IgniteCheckedException In case of error.
      */
@@ -730,7 +733,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
         boolean internal,
         boolean notifyExisting,
         boolean loc,
-        final boolean keepBinary) throws IgniteCheckedException
+        final boolean keepBinary,
+        boolean onStart) throws IgniteCheckedException
     {
         cctx.checkSecurity(SecurityPermission.CACHE_READ);
 
@@ -761,7 +765,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
             pred).get();
 
         try {
-            if (hnd.isQuery() && cctx.userCache())
+            if (hnd.isQuery() && cctx.userCache() && !onStart)
                 hnd.waitTopologyFuture(cctx.kernalContext());
         }
         catch (IgniteCheckedException e) {
@@ -1017,7 +1021,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
                 false,
                 false,
                 false,
-                keepBinary
+                keepBinary,
+                onStart
             );
         }
 


Mime
View raw message