Repository: ignite Updated Branches: refs/heads/ignite-gg-10722 55027dc77 -> 523928806
ignite-gg-10722: proper CacheConfiguration.keepPortableInStore flag initialization when nodes have different versions Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/52392880 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/52392880 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/52392880 Branch: refs/heads/ignite-gg-10722 Commit: 52392880656999707493c7f6cd9c0c02819ffe28 Parents: 55027dc Author: dmagda <[email protected]> Authored: Mon Sep 7 16:43:54 2015 +0300 Committer: dmagda <[email protected]> Committed: Mon Sep 7 16:43:54 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/52392880/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();
