Merge branch ignite-1.5 into ignite-1282
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b278fe3e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b278fe3e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b278fe3e Branch: refs/heads/ignite-1816 Commit: b278fe3e357badcb26e78891d9edb5f31def512c Parents: 0ccba79 Author: Alexey Goncharuk <[email protected]> Authored: Tue Nov 17 13:35:26 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Nov 17 13:35:26 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/preloader/GridDhtPartitionDemander.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b278fe3e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 40d3dc1..7ccb68e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -688,7 +688,7 @@ public class GridDhtPartitionDemander { if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_LOADED) && !cached.isInternal()) cctx.events().addEvent(cached.partition(), cached.key(), cctx.localNodeId(), (IgniteUuid)null, null, EVT_CACHE_REBALANCE_OBJECT_LOADED, entry.value(), true, null, - false, null, null, null); + false, null, null, null, true); } else if (log.isDebugEnabled()) log.debug("Rebalancing entry is already in cache (will ignore) [key=" + cached.key() +
