ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [34/38] incubator-ignite git commit: # IGNITE-54-55 Fix issues found on review.
Date Thu, 05 Feb 2015 17:09:23 GMT
# IGNITE-54-55 Fix issues found on review.


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

Branch: refs/heads/ignite-57
Commit: ec1a01f6fc8f256cc2f32d9af0fca6da06bc3fc1
Parents: 2bb8df1
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Thu Feb 5 16:37:24 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Thu Feb 5 16:37:24 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheAdapter.java      |  1 -
 .../cache/distributed/GridDistributedCacheAdapter.java   | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec1a01f6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 631da77..eed8a54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -31,7 +31,6 @@ import org.apache.ignite.internal.compute.*;
 import org.apache.ignite.internal.processors.cache.affinity.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.processors.cache.dr.*;
 import org.apache.ignite.internal.processors.cache.query.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec1a01f6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index d6e846d..277d8cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -142,13 +142,14 @@ public abstract class GridDistributedCacheAdapter<K, V> extends
GridCacheAdapter
                 topVer = ctx.affinity().affinityTopologyVersion();
 
                 // Send job to all nodes.
-                Collection<ClusterNode> nodes = ctx.grid().forCacheNodes(name()).nodes();
+                Collection<ClusterNode> nodes = ctx.grid().forDataNodes(name()).nodes();
 
                 if (!nodes.isEmpty()) {
                     ctx.closures().callAsyncNoFailover(BROADCAST,
                         new GlobalRemoveAllCallable<>(name(), topVer), nodes, true).get();
                 }
-            } while (ctx.affinity().affinityTopologyVersion() > topVer);
+            }
+            while (ctx.affinity().affinityTopologyVersion() > topVer);
         }
         catch (ClusterGroupEmptyCheckedException ignore) {
             if (log.isDebugEnabled())
@@ -209,7 +210,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends
GridCacheAdapter
          * {@inheritDoc}
          */
         @Override public Object call() throws Exception {
-            final IgniteKernal grid = (IgniteKernal) ignite;
+            final IgniteKernal grid = (IgniteKernal)ignite;
 
             final GridCache<K,V> cache = grid.cachex(cacheName);
 
@@ -221,9 +222,9 @@ public abstract class GridDistributedCacheAdapter<K, V> extends
GridCacheAdapter
                 return null; // Ignore this remove request because remove request will be
sent again.
 
             if (cacheAdapter instanceof GridNearCacheAdapter)
-                cacheAdapter = ((GridNearCacheAdapter)cacheAdapter).dht();
+                cacheAdapter = ((GridNearCacheAdapter<K, V>)cacheAdapter).dht();
 
-            GridDhtCacheAdapter<K, V> dht = (GridDhtCacheAdapter)cacheAdapter;
+            GridDhtCacheAdapter<K, V> dht = (GridDhtCacheAdapter<K, V>)cacheAdapter;
 
             Collection<K> keys = new ArrayList<>();
 


Mime
View raw message