ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: Ignite-424 fix & test
Date Fri, 13 Mar 2015 13:42:08 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-424 a7847c125 -> 313ddf110


Ignite-424 fix & test


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

Branch: refs/heads/ignite-424
Commit: 313ddf110f1043c65470c1104cb7e8f332446bd5
Parents: a7847c1
Author: avinogradov <avinogradov@gridgain.com>
Authored: Fri Mar 13 16:41:52 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Fri Mar 13 16:41:52 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheMapEntry.java       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/313ddf11/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 7f7f67e..6640162 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
@@ -2178,15 +2178,17 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx
{
 
             cctx.dataStructures().onEntryUpdated(key, op == GridCacheOperation.DELETE);
 
-            if (res && intercept) {
-                if (op == GridCacheOperation.UPDATE)
-                    cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key,
key0, updated, updated0));
-                else
-                    cctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(cctx,
key, key0, oldVal, old0));
-            }
+            if (intercept) {
+                if (res) {
+                    if (op == GridCacheOperation.UPDATE)
+                        cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx,
key, key0, updated, updated0));
+                    else
+                        cctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(cctx,
key, key0, oldVal, old0));
+                }
 
-            if (interceptRes != null)
-                oldVal = cctx.toCacheObject(cctx.unwrapTemporary(interceptRes.get2()));
+                if (interceptRes != null)
+                    oldVal = cctx.toCacheObject(cctx.unwrapTemporary(interceptRes.get2()));
+            }
         }
 
         if (log.isDebugEnabled())


Mime
View raw message