You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2015/11/04 15:10:56 UTC
[13/36] ignite git commit: IGNITE-426 Fixed tests.
IGNITE-426 Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e836cae1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e836cae1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e836cae1
Branch: refs/heads/ignite-462-2
Commit: e836cae17f936538ecba2b045d3725f40a253498
Parents: 3aa2f4d
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Fri Oct 23 13:36:37 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Nov 4 17:02:39 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e836cae1/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 81b81e3..abed98d 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
@@ -1188,7 +1188,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
if (cctx.isLocal() || cctx.isReplicated() ||
- (!isNear() && !(tx != null && !tx.onePhaseCommit() && !tx.local())))
+ (!isNear() && !(tx != null && tx.onePhaseCommit() && !tx.local())))
cctx.continuousQueries().onEntryUpdated(this, key, val, old, tx.local(), false, updateIdx0, topVer);
cctx.dataStructures().onEntryUpdated(key, false);
@@ -1364,7 +1364,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
if (cctx.isLocal() || cctx.isReplicated() ||
- (!isNear() && !(tx != null && !tx.onePhaseCommit() && !tx.local())))
+ (!isNear() && !(tx != null && tx.onePhaseCommit() && !tx.local())))
cctx.continuousQueries().onEntryUpdated(this, key, null, old, tx.local(), false, updateIdx0, topVer);
cctx.dataStructures().onEntryUpdated(key, true);