ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [07/50] incubator-ignite git commit: IGNITE-477 - Fixed TTL test.
Date Wed, 08 Apr 2015 14:02:16 GMT
IGNITE-477 - Fixed TTL test.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ec2af0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ec2af0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ec2af0d

Branch: refs/heads/ignite-635
Commit: 5ec2af0d9a01e0b4a0b71cb0d3250e59e8dedc44
Parents: ae4dda1
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Mon Apr 6 11:53:16 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Mon Apr 6 11:53:16 2015 -0700

----------------------------------------------------------------------
 .../processors/cache/distributed/dht/GridDhtTxPrepareFuture.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ec2af0d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index e0fc719..1f991c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -971,7 +971,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
 
         ExpiryPolicy expiry = cacheCtx.expiryForTxEntry(entry);
 
-        if (expiry != null && entry.op() == READ) {
+        if (expiry != null && (entry.op() == READ || entry.op() == NOOP)) {
             entry.op(NOOP);
 
             entry.ttl(CU.toTtl(expiry.getExpiryForAccess()));


Mime
View raw message