ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [10/51] incubator-ignite git commit: IGNITE-701 - Fixed test.
Date Fri, 10 Apr 2015 12:12:21 GMT
IGNITE-701 - Fixed 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/ada2bdef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ada2bdef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ada2bdef

Branch: refs/heads/ignite-709
Commit: ada2bdefe2fe662c0bad26e623f39474876dd873
Parents: 9d183c5
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Wed Apr 8 10:26:15 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Wed Apr 8 10:26:15 2015 -0700

----------------------------------------------------------------------
 .../processors/cache/distributed/dht/GridDhtLockFuture.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ada2bdef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 2c31a13..db7ea09 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -870,7 +870,8 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
                                     IgniteTxEntry txEntry = tx.entry(e.txKey());
 
                                     // NOOP entries will be sent to backups on prepare step.
-                                    txEntry.op(GridCacheOperation.NOOP);
+                                    if (txEntry.op() == GridCacheOperation.READ)
+                                        txEntry.op(GridCacheOperation.NOOP);
                                 }
                             }
 


Mime
View raw message