Repository: ignite Updated Branches: refs/heads/ignite-1537 be66a0cd1 -> 39dd6e5e5
ignite-1.5 Should not wait on preloader sync future for system caches callbacks. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/39dd6e5e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/39dd6e5e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/39dd6e5e Branch: refs/heads/ignite-1537 Commit: 39dd6e5e57464882e8c40e9ee286c9c7be08ce5e Parents: be66a0c Author: sboikov <sboi...@gridgain.com> Authored: Mon Nov 30 13:39:20 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Nov 30 13:39:20 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/39dd6e5e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index b3155a7..4f15fa1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -647,6 +647,8 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid prepareMarshalCacheObjects(nearVals, cctx); + prepareMarshalCacheObjects(prevVals, cctx); + if (forceTransformBackups) { // force addition of deployment info for entry processors if P2P is enabled globally. if (!addDepInfo && ctx.deploymentEnabled()) @@ -674,6 +676,8 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid finishUnmarshalCacheObjects(nearVals, cctx, ldr); + finishUnmarshalCacheObjects(prevVals, cctx, ldr); + if (forceTransformBackups) { entryProcessors = unmarshalCollection(entryProcessorsBytes, ctx, ldr);
