Repository: ignite Updated Branches: refs/heads/ignite-1272 73e63b77d -> 97e1dc23c
ignite-1272: refactoring and hot fixes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97e1dc23 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97e1dc23 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97e1dc23 Branch: refs/heads/ignite-1272 Commit: 97e1dc23ca48317f419b7afb69da924323abbfa9 Parents: 73e63b7 Author: Denis Magda <dma...@gridgain.com> Authored: Mon Oct 12 17:44:54 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Mon Oct 12 17:44:54 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheObjectContext.java | 14 +++++++------- .../internal/processors/cache/GridCacheContext.java | 2 +- .../internal/processors/cache/GridCacheUtils.java | 2 +- .../portable/CacheObjectPortableProcessorImpl.java | 2 +- .../cacheobject/IgniteCacheObjectProcessorImpl.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/97e1dc23/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java index 966cd61..44b91a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java @@ -45,26 +45,26 @@ public class CacheObjectContext { private boolean p2pEnabled; /** */ - private boolean depEnabled; + private boolean addDepInfo; /** * @param kernalCtx Kernal context. * @param dfltAffMapper Default affinity mapper. * @param cpyOnGet Copy on get flag. * @param storeVal {@code True} if should store unmarshalled value in cache. - * @param depEnabled {@code true} if deployment is enabled for the given cache. + * @param addDepInfo {@code true} if deployment info should be associated with the objects of this cache. */ public CacheObjectContext(GridKernalContext kernalCtx, AffinityKeyMapper dfltAffMapper, boolean cpyOnGet, boolean storeVal, - boolean depEnabled) { + boolean addDepInfo) { this.kernalCtx = kernalCtx; this.p2pEnabled = kernalCtx.config().isPeerClassLoadingEnabled(); this.dfltAffMapper = dfltAffMapper; this.cpyOnGet = cpyOnGet; this.storeVal = storeVal; - this.depEnabled = depEnabled; + this.addDepInfo = addDepInfo; proc = kernalCtx.cacheObjects(); } @@ -77,10 +77,10 @@ public class CacheObjectContext { } /** - * @return {@code True} if deployment is enabled for the given cache. + * @return {@code True} if deployment info should be associated with the objects of this cache. */ - public boolean deploymentEnabled() { - return depEnabled; + public boolean addDeploymentInfo() { + return addDepInfo; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/97e1dc23/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index e371079..1f4852c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -1412,7 +1412,7 @@ public class GridCacheContext<K, V> implements Externalizable { } /** - * @return {@code True} if deployment enabled. + * @return {@code True} if deployment is enabled. */ public boolean deploymentEnabled() { return depEnabled; http://git-wip-us.apache.org/repos/asf/ignite/blob/97e1dc23/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index df3b90d..ee1f4a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -943,7 +943,7 @@ public class GridCacheUtils { throws IgniteCheckedException { assert ctx != null; - if (ctx.deploymentEnabled()) { + if (depEnabled) { if (obj != null) { if (obj instanceof Iterable) ctx.deploy().registerClasses((Iterable<?>)obj); http://git-wip-us.apache.org/repos/asf/ignite/blob/97e1dc23/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java index 29b2d46..2de9d84 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java @@ -705,7 +705,7 @@ public class CacheObjectPortableProcessorImpl extends IgniteCacheObjectProcessor ctx0.copyOnGet(), ctx0.storeValue(), portableEnabled, - ctx0.deploymentEnabled()); + ctx0.addDeploymentInfo()); ctx.resource().injectGeneric(res.defaultAffMapper()); http://git-wip-us.apache.org/repos/asf/ignite/blob/97e1dc23/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 cca8b00..0bc102e 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 @@ -91,7 +91,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme /** {@inheritDoc} */ @Override public byte[] marshal(CacheObjectContext ctx, Object val) throws IgniteCheckedException { - return CU.marshal(ctx.kernalContext().cache().context(), ctx.deploymentEnabled(), val); + return CU.marshal(ctx.kernalContext().cache().context(), ctx.addDeploymentInfo(), val); } /** {@inheritDoc} */
