Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-709_3 6d1104372 -> 4937822ab


# ignite-709_3


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

Branch: refs/heads/ignite-709_3
Commit: 4937822ab437288a189505736d89c1ba83670a97
Parents: 6d11043
Author: sboikov <[email protected]>
Authored: Fri May 15 15:32:59 2015 +0300
Committer: sboikov <[email protected]>
Committed: Fri May 15 15:32:59 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/MarshallerContextImpl.java     | 2 +-
 .../cache/datastructures/CacheDataStructuresManager.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4937822a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 85939a6..13160b3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -59,7 +59,7 @@ public class MarshallerContextImpl extends 
MarshallerContextAdapter {
         
ctx.cache().marshallerCache().context().continuousQueries().executeInternalQuery(
             new ContinuousQueryListener(log, workDir),
             null,
-            true,
+            !ctx.config().isClientMode(),
             true
         );
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4937822a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
index fa8d192..b5c5161 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
@@ -218,7 +218,7 @@ public class CacheDataStructuresManager extends 
GridCacheManagerAdapter {
                         }
                     },
                     new QueueHeaderPredicate(),
-                    cctx.isLocal() || cctx.isReplicated(),
+                    cctx.isLocal() || (cctx.isReplicated() && 
cctx.affinityNode()),
                     true);
             }
 

Reply via email to