You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/09/08 19:08:57 UTC

[07/45] ignite git commit: fixed CacheConfiguration.keepPortableInStore initialization when a config is transferred between nodes with different versions

fixed CacheConfiguration.keepPortableInStore initialization when a config is transferred between nodes with different versions


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

Branch: refs/heads/ignite-264
Commit: b1f119fd84455cbbce3f131f92a2bd821f91675c
Parents: 1fe7e95
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Sep 7 17:51:29 2015 +0300
Committer: dmagda <ma...@gmail.com>
Committed: Mon Sep 7 17:51:29 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/configuration/CacheConfiguration.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f119fd/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 85eed47..643804f 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -383,7 +383,8 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
         invalidate = cc.isInvalidate();
         isReadThrough = cc.isReadThrough();
         isWriteThrough = cc.isWriteThrough();
-        keepPortableInStore = cc.isKeepPortableInStore();
+        keepPortableInStore = cc.isKeepPortableInStore() != null ? cc.isKeepPortableInStore() :
+            DFLT_KEEP_PORTABLE_IN_STORE;
         listenerConfigurations = cc.listenerConfigurations;
         loadPrevVal = cc.isLoadPreviousValue();
         longQryWarnTimeout = cc.getLongQueryWarningTimeout();