ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [1/2] incubator-ignite git commit: IGNITE-45 - Fixed assertion.
Date Tue, 24 Mar 2015 02:45:51 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-45 f586d43db -> b3298b61c


IGNITE-45 - Fixed assertion.


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

Branch: refs/heads/ignite-45
Commit: e1a067b3ac279f8cf80222842d0572e61fdde331
Parents: 59960c9
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Mon Mar 23 19:45:25 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Mon Mar 23 19:45:25 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1a067b3/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 949a11c..9680582 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
@@ -945,6 +945,10 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
                     loadMap.keySet(),
                     new CI2<KeyCacheObject, Object>() {
                         @Override public void apply(KeyCacheObject key, Object val) {
+                            // No value loaded from store.
+                            if (val == null)
+                                return;
+
                             GridDhtCacheEntry entry0 = loadMap.get(key);
 
                             try {


Mime
View raw message