futures: api cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/13badb8c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13badb8c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13badb8c Branch: refs/heads/ignite-51 Commit: 13badb8c5585754f5a70ebea8f120fb49b0c5192 Parents: 95f840f Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Mar 6 12:06:45 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Mar 6 12:06:45 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13badb8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index c7670c2..dd02343 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -1980,7 +1980,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { req.subjectId(), taskName); - assert updRes.newTtl() == CU.TTL_NOT_CHANGED || expiry != null; + assert !updRes.success() || updRes.newTtl() == CU.TTL_NOT_CHANGED || expiry != null : + "success=" + updRes.success() + ", newTtl=" + updRes.newTtl() + ", expiry=" + expiry; if (intercept) { if (op == UPDATE) @@ -2053,7 +2054,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { assert f == null : f; } - } else if (readers.contains(node.id())) // Reader became primary or backup. + } + else if (readers.contains(node.id())) // Reader became primary or backup. entry.removeReader(node.id(), req.messageId()); else res.addSkippedIndex(firstEntryIdx + i);
