#ignite-758: add default constructor to CacheOperationContext.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/645c896a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/645c896a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/645c896a Branch: refs/heads/ignite-737 Commit: 645c896aa2ba97fe37d56d4fe4fe063b5361d03f Parents: ca4af1c Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Apr 17 11:22:47 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Apr 17 11:22:47 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheOperationContext.java | 13 +++++++++++++ .../internal/processors/cache/GridCacheProcessor.java | 6 ++---- .../internal/processors/cache/IgniteCacheProxy.java | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/645c896a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java index 3adf877..764a058 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java @@ -46,6 +46,19 @@ public class CacheOperationContext implements Serializable { private final ExpiryPolicy expiryPlc; /** + * Constructor with default values. + */ + public CacheOperationContext() { + skipStore = false; + + subjId = null; + + keepPortable = false; + + expiryPlc = null; + } + + /** * @param skipStore Skip store flag. * @param subjId Subject ID. * @param keepPortable Keep portable flag. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/645c896a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index f9ab6c6..36695a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -735,8 +735,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { startCache(cache); - jCacheProxies.put(maskNull(name), new IgniteCacheProxy(ctx, cache, - new CacheOperationContext(false, null, false, null), false)); + jCacheProxies.put(maskNull(name), new IgniteCacheProxy(ctx, cache, null, false)); } } @@ -1518,8 +1517,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { String masked = maskNull(cacheCtx.name()); - jCacheProxies.put(masked, new IgniteCacheProxy(cache.context(), cache, - new CacheOperationContext(false, null, false, null), false)); + jCacheProxies.put(masked, new IgniteCacheProxy(cache.context(), cache, null, false)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/645c896a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index da26a27..35332d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -104,7 +104,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V this.ctx = ctx; this.delegate = delegate; - this.prjCtx = prjCtx; + this.prjCtx = prjCtx == null ? new CacheOperationContext() : prjCtx; gate = ctx.gate(); }
