Repository: incubator-ignite Updated Branches: refs/heads/ignite-565 848e1de73 -> 528bf007a
#ignite-565: remove GridCache from tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/528bf007 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/528bf007 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/528bf007 Branch: refs/heads/ignite-565 Commit: 528bf007a252017592ca34623ed89190da6f59b3 Parents: 848e1de Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Mar 25 12:19:51 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Mar 25 12:19:51 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/GridDistributedCacheAdapter.java | 2 +- .../internal/processors/cache/GridCacheAbstractSelfTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/528bf007/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 6517fd0..445efd0 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 @@ -291,7 +291,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter dataLdr.receiver(DataStreamerCacheUpdaters.<KeyCacheObject, Object>batched()); for (GridDhtLocalPartition locPart : dht.topology().currentLocalPartitions()) { - if (!locPart.isEmpty() && locPart.primary(topVer)) { + if (!locPart.isEmpty()) { for (GridDhtCacheEntry o : locPart.entries()) dataLdr.removeDataInternal(o.key()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/528bf007/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index 8b60f92..e997780 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -113,7 +113,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { assertTrue( "Cache is not empty: " + " localSize = " + jcache(fi).localSize() - + ", localEntries next = " + jcache(fi).localEntries().iterator().hasNext(), + + ", local entries " + entrySet(jcache(fi).localEntries()), GridTestUtils.waitForCondition( // Preloading may happen as nodes leave, so we need to wait. new GridAbsPredicateX() {
