ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: #ignite-286: wip
Date Mon, 27 Apr 2015 08:04:41 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-286 90a5ad8d1 -> 57de2738b


#ignite-286: wip


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

Branch: refs/heads/ignite-286
Commit: 57de2738b42dd2b02fd37e1934e92783bd113be6
Parents: 90a5ad8
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Apr 27 11:04:39 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Apr 27 11:04:39 2015 +0300

----------------------------------------------------------------------
 .../distributed/dht/colocated/GridDhtColocatedLockFuture.java      | 2 ++
 .../processors/cache/GridCacheAbstractFullApiSelfTest.java         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57de2738/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 5b74b31..f10baa3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -786,6 +786,8 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
                         catch (GridCacheEntryRemovedException ignored) {
                             if (log.isDebugEnabled())
                                 log.debug("Got removed entry in lockAsync(..) method (will
retry): " + entry);
+
+                            entry = null;
                         }
                     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57de2738/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 9d5a1e8..70d8f9c 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
@@ -4586,7 +4586,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
             checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, OPTIMISTIC,
SERIALIZABLE);
 
-            //checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC,
READ_COMMITTED);
+            checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC,
READ_COMMITTED);
 
             checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC,
REPEATABLE_READ);
 


Mime
View raw message