#ignite-758: CacheProjectionContext  is not Nullable in IgniteCacheProxy.

Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/75529399
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75529399
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75529399

Branch: refs/heads/ignite-758
Commit: 755293991d709da91c57a24e2622fbecfc50784b
Parents: 3811c9a
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Thu Apr 16 11:30:21 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Thu Apr 16 11:30:21 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheProcessor.java   | 6 ++++--
 .../ignite/internal/processors/cache/IgniteCacheProxy.java     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75529399/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 2859061..1353363 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,7 +735,8 @@ public class GridCacheProcessor extends 
GridProcessorAdapter {
 
                 startCache(cache);
 
-                jCacheProxies.put(maskNull(name), new IgniteCacheProxy(ctx, 
cache, null, false));
+                jCacheProxies.put(maskNull(name), new IgniteCacheProxy(ctx, 
cache,
+                    new CacheProjectionContext(false, null, false, null), 
false));
             }
         }
 
@@ -1517,7 +1518,8 @@ public class GridCacheProcessor extends 
GridProcessorAdapter {
 
                 String masked = maskNull(cacheCtx.name());
 
-                jCacheProxies.put(masked, new 
IgniteCacheProxy(cache.context(), cache, null, false));
+                jCacheProxies.put(masked, new 
IgniteCacheProxy(cache.context(), cache,
+                    new CacheProjectionContext(false, null, false, null), 
false));
             }
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75529399/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 c8d3200..408f7f1 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
@@ -98,7 +98,7 @@ public class IgniteCacheProxy<K, V> extends 
AsyncSupportAdapter<IgniteCache<K, V
     public IgniteCacheProxy(
         GridCacheContext<K, V> ctx,
         GridCacheAdapter<K, V> delegate,
-        @Nullable CacheProjectionContext prjCtx,
+        CacheProjectionContext prjCtx,
         boolean async
     ) {
         super(async);

Reply via email to