ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject incubator-ignite git commit: # IGNITE-598: Fixing.
Date Wed, 01 Apr 2015 06:58:16 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-598 5df18d559 -> fb436fe6f


# IGNITE-598: Fixing.


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

Branch: refs/heads/ignite-598
Commit: fb436fe6fa7ae3ebb2c217be2dde4766fb4b20f9
Parents: 5df18d5
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Wed Apr 1 09:58:24 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Wed Apr 1 09:58:24 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/configuration/CacheConfiguration.java    | 4 ++--
 .../ignite/internal/processors/cache/GridCacheProcessor.java   | 2 +-
 .../ignite/internal/processors/cache/GridCacheUtils.java       | 6 +++---
 .../ignite/internal/processors/plugin/CachePluginManager.java  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb436fe6/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 971d711..8d5ba6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -413,7 +413,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
         writeBehindFlushSize = cc.getWriteBehindFlushSize();
         writeBehindFlushThreadCnt = cc.getWriteBehindFlushThreadCount();
         writeSync = cc.getWriteSynchronizationMode();
-        pluginCfgs = cc.getPluginConfiguration();
+        pluginCfgs = cc.getPluginConfigurations();
     }
 
     /**
@@ -1585,7 +1585,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
      *
      * @return Cache plugin configurations.
      */
-    public CachePluginConfiguration[] getPluginConfiguration() {
+    public CachePluginConfiguration[] getPluginConfigurations() {
         return pluginCfgs != null ? pluginCfgs : new CachePluginConfiguration[0];
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb436fe6/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 f69cdd7..6716d2e 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
@@ -2029,7 +2029,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         
         // TODO 10006: implement remote configs validation.
         // Check plugin configurations.
-//        for (CachePluginConfiguration locPluginCcfg : locCfg.getPluginConfiguration())
{
+//        for (CachePluginConfiguration locPluginCcfg : locCfg.getPluginConfigurations())
{
 //            CachePluginProvider provider = ...;
 //
 //            provider.validateRemote(locCfg, locPluginCcfg, rmtCfg, rmtNode);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb436fe6/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 fb34cb0..8f48d3d 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
@@ -1836,8 +1836,8 @@ public class GridCacheUtils {
      */
     public static <C extends CachePluginConfiguration> C cachePluginConfiguration(
         CacheConfiguration cfg, Class<C> cl) {
-        if (cfg.getPluginConfiguration() != null) {
-            for (CachePluginConfiguration pluginCfg : cfg.getPluginConfiguration()) {
+        if (cfg.getPluginConfigurations() != null) {
+            for (CachePluginConfiguration pluginCfg : cfg.getPluginConfigurations()) {
                 if (pluginCfg.getClass() == cl)
                     return (C)pluginCfg;
             }
@@ -1857,7 +1857,7 @@ public class GridCacheUtils {
 
         if (cfg.getCacheConfiguration() != null) {
             for (CacheConfiguration ccfg : cfg.getCacheConfiguration()) {
-                for (CachePluginConfiguration pluginCcfg : ccfg.getPluginConfiguration())
{
+                for (CachePluginConfiguration pluginCcfg : ccfg.getPluginConfigurations())
{
                     if (cls == pluginCcfg.getClass())
                         res.add((T)pluginCcfg);
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb436fe6/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
index cd44696..993d4b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java
@@ -38,8 +38,8 @@ public class CachePluginManager extends GridCacheManagerAdapter {
      * @param cfg Cache config.
      */
     public CachePluginManager(GridKernalContext ctx, CacheConfiguration cfg) {
-        if (cfg.getPluginConfiguration() != null) {
-            for (CachePluginConfiguration cachePluginCfg : cfg.getPluginConfiguration())
{
+        if (cfg.getPluginConfigurations() != null) {
+            for (CachePluginConfiguration cachePluginCfg : cfg.getPluginConfigurations())
{
                 CachePluginContext pluginCtx = new GridCachePluginContext(ctx, cfg, cachePluginCfg);
 
                 CachePluginProvider provider = cachePluginCfg.createProvider(pluginCtx);


Mime
View raw message