ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-2620 Skip empty entries in GridCacheMapEntry.onTtlExpired
Date Wed, 25 May 2016 07:12:19 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 046657baf -> 6fc274aaf


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/6fc274aa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6fc274aa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6fc274aa

Branch: refs/heads/master
Commit: 6fc274aaf075744e5eda443ffe8c8e7d84cd61cc
Parents: 046657b
Author: sboikov <sboikov@gridgain.com>
Authored: Tue May 24 16:57:20 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed May 25 10:12:11 2016 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/6fc274aa/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 629c6fc..b247b7f 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
@@ -3674,6 +3674,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