Repository: ignite Updated Branches: refs/heads/ignite-1537 00790c8c3 -> a8f6c24d2
ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a8f6c24d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a8f6c24d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a8f6c24d Branch: refs/heads/ignite-1537 Commit: a8f6c24d287688913059b83f945ecb6c7af7d2ef Parents: 00790c8 Author: sboikov <[email protected]> Authored: Wed Dec 23 11:25:25 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Dec 23 11:25:25 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a8f6c24d/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 2c2ec3f..0d9c541 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 @@ -3328,11 +3328,11 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - return c.localPeek(key, ONHEAP) == null; + return peek(c, key) == null; } }, 2000); - assertNull(c.localPeek(key, ONHEAP)); + assertNull(peek(c, key)); assert c.localSize() == 0; }
