[12/12] incubator-ignite git commit: Merge branches 'ignite-96' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-96

[yzhdanov]

Merge branches 'ignite-96' and 'sprint-1' of 
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-96

Conflicts:
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java


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

Branch: refs/heads/ignite-96
Commit: 824eb57ec9252f3481601b3048657f49d73f686b
Parents: 5f92028
Author: Yakov Zhdanov <yzhda...@gridgain.com>
Authored: Mon Feb 9 23:51:48 2015 +0300
Committer: Yakov Zhdanov <yzhda...@gridgain.com>
Committed: Mon Feb 9 23:51:48 2015 +0300

----------------------------------------------------------------------
 .../GridCachePartitionedReloadAllAbstractSelfTest.java      | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/824eb57e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
index eb1900e..27d5589 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
@@ -211,9 +211,8 @@ public abstract class 
GridCachePartitionedReloadAllAbstractSelfTest extends Grid
             cache.reloadAll(map.keySet());
 
             for (Integer key : map.keySet()) {
-                CacheEntry entry = cache.entry(key);
-
-                if (entry.primary() || entry.backup() || nearEnabled())
+                if 
(cache.affinity().isPrimaryOrBackup(grid(caches.indexOf(cache)).localNode(), 
key) ||
+                    nearEnabled())
                     assertEquals(map.get(key), cache.peek(key));
                 else
                     assertNull(cache.peek(key));
@@ -230,11 +229,11 @@ public abstract class 
GridCachePartitionedReloadAllAbstractSelfTest extends Grid
      * @param cnt Keys count.
      * @return Collection of keys for which given cache is primary.
      */
-    private Iterable<Integer> 
primaryKeysForCache(CacheProjection<Integer,String> cache, int cnt) {
+    private Iterable<Integer> primaryKeysForCache(GridCache<Integer,String> 
cache, int cnt) {
         Collection<Integer> found = new ArrayList<>(cnt);
 
         for (int i = 0; i < 10000; i++) {
-            if (cache.entry(i).primary()) {
+            if 
(cache.affinity().isPrimary(grid(caches.indexOf(cache)).localNode(), i)) {
                 found.add(i);
 
                 if (found.size() == cnt)