ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/50] [abbrv] incubator-ignite git commit: # ignite-51
Date Wed, 11 Mar 2015 19:49:29 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-406 50a789f56 -> 75663ab94


# ignite-51


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

Branch: refs/heads/ignite-406
Commit: b404071f0ba7a5af0d251c1406a9933cc8a269ae
Parents: a0976cd
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Mar 10 15:50:30 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Mar 10 15:50:30 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/atomic/GridDhtAtomicCache.java          | 3 ++-
 .../processors/cache/local/atomic/GridLocalAtomicCache.java       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b404071f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index cf0ee34..c5329d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1937,7 +1937,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
                     continue;
                 }
 
-                if (storeErr != null && storeErr.failedKeys().contains(entry.key()))
+                if (storeErr != null &&
+                    storeErr.failedKeys().contains(entry.key().value(ctx.cacheObjectContext(),
false)))
                     continue;
 
                 try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b404071f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 248515c..c32a8a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -1414,7 +1414,8 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
 
             assert Thread.holdsLock(entry);
 
-            if (entry.obsolete() || (storeErr != null && storeErr.failedKeys().contains(entry.key())))
+            if (entry.obsolete() ||
+                (storeErr != null && storeErr.failedKeys().contains(entry.key().value(ctx.cacheObjectContext(),
false))))
                 continue;
 
             try {


Mime
View raw message