Repository: ignite Updated Branches: refs/heads/ignite-426-2-reb 7040de21f -> 1794594a5
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/1794594a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1794594a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1794594a Branch: refs/heads/ignite-426-2-reb Commit: 1794594a5b24e369e699d8b1fd18b3fcd2357dfb Parents: 7040de2 Author: nikolay_tikhonov <[email protected]> Authored: Fri Oct 23 13:36:37 2015 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Fri Oct 23 13:36:37 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/1794594a/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 d10d86b..0b2a7fd 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 @@ -1136,7 +1136,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); @@ -1303,7 +1303,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);
