ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [04/50] incubator-ignite git commit: # IGNITE-644 - Review
Date Thu, 02 Apr 2015 10:23:43 GMT
# IGNITE-644 - Review


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

Branch: refs/heads/ignite-593
Commit: ad140b906526cb95f6db14daf9f1c025e2e45c9d
Parents: f1f873b
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Tue Mar 31 14:18:50 2015 -0700
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Tue Mar 31 14:18:50 2015 -0700

----------------------------------------------------------------------
 .../org/apache/ignite/internal/IgnitionEx.java  | 34 +++++++++++---------
 1 file changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad140b90/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 7442d12..5b52919 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1751,7 +1751,7 @@ public class IgnitionEx {
             }
 
             // Always add marshaller and utility caches.
-            copies[0] = marshallerSystemCache();
+            copies[0] = marshallerSystemCache(clientDisco);
             copies[1] = utilitySystemCache(clientDisco);
 
             cfg.setCacheConfiguration(copies);
@@ -1899,20 +1899,24 @@ public class IgnitionEx {
          *
          * @return Marshaller system cache configuration.
          */
-        private static CacheConfiguration marshallerSystemCache() {
-            CacheConfiguration cache = new CacheConfiguration();
-
-            cache.setName(CU.MARSH_CACHE_NAME);
-            cache.setCacheMode(REPLICATED);
-            cache.setAtomicityMode(ATOMIC);
-            cache.setSwapEnabled(false);
-            cache.setRebalanceMode(SYNC);
-            cache.setWriteSynchronizationMode(FULL_SYNC);
-            cache.setAffinity(new RendezvousAffinityFunction(false, 20));
-            cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-            cache.setStartSize(300);
-
-            return cache;
+        private static CacheConfiguration marshallerSystemCache(boolean client) {
+            if (!client) {
+                CacheConfiguration cache = new CacheConfiguration();
+
+                cache.setName(CU.MARSH_CACHE_NAME);
+                cache.setCacheMode(REPLICATED);
+                cache.setAtomicityMode(ATOMIC);
+                cache.setSwapEnabled(false);
+                cache.setRebalanceMode(SYNC);
+                cache.setWriteSynchronizationMode(FULL_SYNC);
+                cache.setAffinity(new RendezvousAffinityFunction(false, 20));
+                cache.setNodeFilter(CacheConfiguration.ALL_NODES);
+                cache.setStartSize(300);
+
+                return cache;
+            }
+
+            return null;
         }
 
         /**


Mime
View raw message