Restoring backward compatibility for cache objects
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/71164244 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/71164244 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/71164244 Branch: refs/heads/ignite-1.3.3-p6 Commit: 71164244d6138418be3b8ec1801784ab39f330bd Parents: 297d25d Author: Valentin Kulichenko <[email protected]> Authored: Mon Aug 24 19:20:59 2015 -0700 Committer: Valentin Kulichenko <[email protected]> Committed: Mon Aug 24 19:20:59 2015 -0700 ---------------------------------------------------------------------- .../processors/cacheobject/IgniteCacheObjectProcessor.java | 2 +- .../processors/cacheobject/IgniteCacheObjectProcessorImpl.java | 2 +- .../ignite/internal/processors/query/GridQueryProcessor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/71164244/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java index dc0d1e5..b9b6132 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java @@ -78,7 +78,7 @@ public interface IgniteCacheObjectProcessor extends GridProcessor { * * @return {@code true} If portable objects are enabled. */ - public boolean isPortableEnabled(); + public boolean isPortableEnabled(CacheConfiguration<?, ?> ccfg); /** * @param obj Portable object to get field from. http://git-wip-us.apache.org/repos/asf/ignite/blob/71164244/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java index 3e59b10..e8f7781 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java @@ -233,7 +233,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme } /** {@inheritDoc} */ - @Override public boolean isPortableEnabled() { + @Override public boolean isPortableEnabled(CacheConfiguration<?, ?> ccfg) { return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/71164244/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 6af0f40..049e3de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -140,7 +140,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { TypeId typeId; - if (valCls == null || ctx.cacheObjects().isPortableEnabled()) { + if (valCls == null || ctx.cacheObjects().isPortableEnabled(ccfg)) { processPortableMeta(meta, desc); typeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(meta.getValueType()));
