You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/08/11 09:27:44 UTC
[35/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC
updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b09e15f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b09e15f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b09e15f
Branch: refs/heads/ignite-426
Commit: 1b09e15f34af5a7c4296eab8c278bac8103af48d
Parents: 0551155
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue Aug 4 22:20:14 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue Aug 4 22:20:14 2015 -0700
----------------------------------------------------------------------
.../near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b09e15f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index f30ea71..64bace5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -412,10 +412,12 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
GridCacheEntryEx entry = dht.peekEx(key);
- assert entry != null;
-
- assertEquals(0, entry.ttl());
- assertEquals(0, entry.expireTime());
+ if (atomicityMode() == CacheAtomicityMode.ATOMIC)
+ assertNull(entry);
+ else {
+ assertEquals(0, entry.ttl());
+ assertEquals(0, entry.expireTime());
+ }
}
// Ensure that next update will not pick old expire time.