ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject ignite git commit: IGNITE-3004 Temp fix.
Date Mon, 16 May 2016 15:41:10 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-3004 3970684cb -> 1d80130e2


IGNITE-3004 Temp fix.


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

Branch: refs/heads/ignite-3004
Commit: 1d80130e2d12d7b97016374295c925706aa0d945
Parents: 3970684
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Mon May 16 18:40:56 2016 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Mon May 16 18:40:56 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheMapEntry.java    | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1d80130e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 9556df1..97e6af6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1379,6 +1379,12 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter
impleme
 
             update(null, 0, 0, newVer, true);
 
+            if (cctx.offheapTiered() && hadValPtr) {
+                boolean rmv = cctx.swap().removeOffheap(key);
+
+                assert rmv;
+            }
+
             if (cctx.deferredDelete() && !detached() && !isInternal()) {
                 if (!deletedUnlocked()) {
                     deletedUnlocked(true);


Mime
View raw message