Repository: ignite Updated Branches: refs/heads/ignite-950-new f4ab699bc -> 6154fb52e
IGNITE-950-new - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6154fb52 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6154fb52 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6154fb52 Branch: refs/heads/ignite-950-new Commit: 6154fb52e5465bc6b7fd84a07a2f316b8fddb3a2 Parents: f4ab699 Author: Alexey Goncharuk <[email protected]> Authored: Mon Nov 2 14:55:14 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Nov 2 14:55:14 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAdapter.java | 2 +- .../internal/processors/cache/GridCacheEventManager.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6154fb52/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 718b362..9a61bdb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -943,7 +943,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V if (doomed != null && ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED)) // Event notification. ctx.events().addEvent(doomed.partition(), doomed.key(), locNodeId, (IgniteUuid)null, null, - EVT_CACHE_ENTRY_DESTROYED, null, false, null, false, null, null, null, false); + EVT_CACHE_ENTRY_DESTROYED, null, false, null, false, null, null, null, true); if (created != null) { // Event notification. http://git-wip-us.apache.org/repos/asf/ignite/blob/6154fb52/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java index 4ca015e..afca43b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java @@ -26,7 +26,6 @@ import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.X; -import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.LT; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -270,12 +269,12 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { type, part, cctx.isNear(), - key == null ? null : key.value(cctx.cacheObjectContext(), false), + cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepPortable, false), xid, lockId, - cctx.cacheObjectContext().unwrapPortableIfNeeded(newVal, keepPortable, true), + cctx.cacheObjectContext().unwrapPortableIfNeeded(newVal, keepPortable, false), hasNewVal, - cctx.cacheObjectContext().unwrapPortableIfNeeded(oldVal, keepPortable, true), + cctx.cacheObjectContext().unwrapPortableIfNeeded(oldVal, keepPortable, false), hasOldVal, subjId, cloClsName,
