You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/02/02 11:28:48 UTC
[12/50] [abbrv] incubator-ignite git commit: # Cache store manager fix
# Cache store manager fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/673d11b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/673d11b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/673d11b5
Branch: refs/heads/ignite-16
Commit: 673d11b591789d37f5f5240ad267e875f76d3821
Parents: 6cab420
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Wed Jan 28 17:45:30 2015 -0800
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Wed Jan 28 17:45:30 2015 -0800
----------------------------------------------------------------------
.../processors/cache/GridCacheStoreManager.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/673d11b5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
index 741a8c9..61408cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
@@ -176,17 +176,17 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
}
}
- if (!cctx.config().isKeepPortableInStore()) {
- if (cctx.config().isPortableEnabled()) {
- if (store instanceof GridInteropAware)
- ((GridInteropAware)store).configure(true);
- else
- convertPortable = true;
- }
+ boolean convertPortable = !cctx.config().isKeepPortableInStore();
+
+ if (cctx.config().isPortableEnabled()) {
+ if (store instanceof GridInteropAware)
+ ((GridInteropAware)store).configure(cctx.cache().name(), convertPortable);
else
- U.warn(log, "GridCacheConfiguration.isKeepPortableInStore() configuration property will " +
- "be ignored because portable mode is not enabled for cache: " + cctx.namex());
+ this.convertPortable = convertPortable;
}
+ else if (convertPortable)
+ U.warn(log, "GridCacheConfiguration.isKeepPortableInStore() configuration property will " +
+ "be ignored because portable mode is not enabled for cache: " + cctx.namex());
}
/** {@inheritDoc} */