ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: ignite-598: fix review comments
Date Tue, 31 Mar 2015 10:24:55 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-598 ec206d5eb -> 6c2a55103


ignite-598: fix review comments


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

Branch: refs/heads/ignite-598
Commit: 6c2a55103bfbacdc580871e652ffbac1245053c2
Parents: ec206d5
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Tue Mar 31 13:24:52 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Tue Mar 31 13:24:52 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheContext.java   | 14 +++++++-------
 .../internal/processors/cache/GridCacheProcessor.java | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c2a5510/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 9fe8ab5..84321bd 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
@@ -137,7 +137,7 @@ public class GridCacheContext<K, V> implements Externalizable {
     private CacheJtaManagerAdapter jtaMgr;
 
     /** Cache plugin manager. */
-    private CachePluginManager cachePluginMgr;
+    private CachePluginManager pluginMgr;
 
     /** Managers. */
     private List<GridCacheManager<K, V>> mgrs = new LinkedList<>();
@@ -224,7 +224,7 @@ public class GridCacheContext<K, V> implements Externalizable {
      * @param ttlMgr TTL manager.
      * @param drMgr Data center replication manager.
      * @param jtaMgr JTA manager.
-     * @param cachePluginMgr Cache plugin manager.
+     * @param pluginMgr Cache plugin manager.
      */
     @SuppressWarnings({"unchecked"})
     public GridCacheContext(
@@ -249,7 +249,7 @@ public class GridCacheContext<K, V> implements Externalizable {
         GridCacheTtlManager ttlMgr,
         GridCacheDrManager drMgr,
         CacheJtaManagerAdapter jtaMgr,
-        CachePluginManager cachePluginMgr
+        CachePluginManager pluginMgr
         ) {
         assert ctx != null;
         assert sharedCtx != null;
@@ -264,7 +264,7 @@ public class GridCacheContext<K, V> implements Externalizable {
         assert affMgr != null;
         assert dataStructuresMgr != null;
         assert ttlMgr != null;
-        assert cachePluginMgr != null;
+        assert pluginMgr != null;
 
         this.ctx = ctx;
         this.sharedCtx = sharedCtx;
@@ -286,7 +286,7 @@ public class GridCacheContext<K, V> implements Externalizable {
         this.ttlMgr = add(ttlMgr);
         this.drMgr = add(drMgr);
         this.jtaMgr = add(jtaMgr);
-        this.cachePluginMgr = add(cachePluginMgr);
+        this.pluginMgr = add(pluginMgr);
 
         log = ctx.log(getClass());
 
@@ -1017,8 +1017,8 @@ public class GridCacheContext<K, V> implements Externalizable
{
     /**
      * @return Cache plugin manager.
      */
-    public CachePluginManager cachePlugin() {
-        return cachePluginMgr;
+    public CachePluginManager plugin() {
+        return pluginMgr;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c2a5510/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 9d69491..50aece8 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
@@ -1014,8 +1014,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         CacheContinuousQueryManager contQryMgr = new CacheContinuousQueryManager();
         CacheDataStructuresManager dataStructuresMgr = new CacheDataStructuresManager();
         GridCacheTtlManager ttlMgr = new GridCacheTtlManager();
-        CachePluginManager cachePluginMgr = new CachePluginManager(ctx, cfg);
-        GridCacheDrManager drMgr = cachePluginMgr.createComponent(GridCacheDrManager.class);
+        CachePluginManager pluginMgr = new CachePluginManager(ctx, cfg);
+        GridCacheDrManager drMgr = pluginMgr.createComponent(GridCacheDrManager.class);
 
         GridCacheStoreManager storeMgr = new GridCacheStoreManager(ctx, sesHolders, cfgStore,
cfg);
 
@@ -1040,7 +1040,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             ttlMgr,
             drMgr,
             jta,
-            cachePluginMgr);
+            pluginMgr);
 
         cacheCtx.cacheObjectContext(cacheObjCtx);
 
@@ -1142,8 +1142,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             swapMgr = new GridCacheSwapManager(true);
             evictMgr = new GridCacheEvictionManager();
             evtMgr = new GridCacheEventManager();
-            drMgr = cachePluginMgr.createComponent(GridCacheDrManager.class);
-            cachePluginMgr = new CachePluginManager(ctx, cfg);
+            drMgr = pluginMgr.createComponent(GridCacheDrManager.class);
+            pluginMgr = new CachePluginManager(ctx, cfg);
 
             cacheCtx = new GridCacheContext(
                 ctx,
@@ -1166,7 +1166,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                 ttlMgr,
                 drMgr,
                 jta, 
-                cachePluginMgr);
+                pluginMgr);
 
             cacheCtx.cacheObjectContext(cacheObjCtx);
 


Mime
View raw message