Repository: incubator-ignite Updated Branches: refs/heads/sprint-1 4d49fdb15 -> 37c699bfd
ignite-96 minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/37c699bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/37c699bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/37c699bf Branch: refs/heads/sprint-1 Commit: 37c699bfd425c34f0a9db3a18b3414984b5788a3 Parents: 4d49fdb Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Feb 9 13:53:06 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Feb 9 13:53:06 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 2 +- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c699bf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 5e3edea..d57648b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -3822,7 +3822,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> try { if (!hasReaders() && markObsolete0(obsoleteVer, false)) { - if (!isStartVersion()) { + if (!isStartVersion() && hasValueUnlocked()) { boolean plain = val instanceof byte[]; IgniteUuid valClsLdrId = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c699bf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index e5e92f7..546c476 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -3356,7 +3356,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract Thread.sleep(ttl + 100); // Peek will actually remove entry from cache. - assert cache.localPeek(key, CachePeekMode.ONHEAP) == null; + assertNull(cache.localPeek(key, CachePeekMode.ONHEAP)); assert cache.localSize() == 0; } @@ -3695,6 +3695,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache.put(Integer.toString(i), i); entries.put(Integer.toString(i), i); + + if (i > 0 && i % 500 == 0) + info("Puts finished: " + i); } checkIteratorHasNext();
