ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [08/17] ignite git commit: ignite-2620 Skip empty entries in GridCacheMapEntry.onTtlExpired
Date Thu, 26 May 2016 06:30:38 GMT
ignite-2620 Skip empty entries in GridCacheMapEntry.onTtlExpired


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

Branch: refs/heads/ignite-3116
Commit: a0141a44f6d5f4c6a9348ff95a0807865af436ac
Parents: 8579024
Author: sboikov <sboikov@gridgain.com>
Authored: Tue May 24 16:57:20 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue May 24 16:57:20 2016 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/a0141a44/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 74dfe00..b369df1 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
@@ -3692,6 +3692,9 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter
impleme
 
                 CacheObject expiredVal = rawGetOrUnmarshal(false);
 
+                if (expiredVal == null)
+                    return false;
+
                 if (onExpired(expiredVal, obsoleteVer)) {
                     if (cctx.deferredDelete()) {
                         deferred = true;


Mime
View raw message