Repository: ignite Updated Branches: refs/heads/ignite-9084 [created] 5352825f0
IGNITE-9084 Fixed conflicting message ID Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5352825f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5352825f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5352825f Branch: refs/heads/ignite-9084 Commit: 5352825f09eeb088f7ef4a4d7ed13605f1581670 Parents: 53f59f5 Author: Alexey Goncharuk <[email protected]> Authored: Tue Sep 11 10:44:53 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Sep 11 10:44:53 2018 +0300 ---------------------------------------------------------------------- .../managers/communication/GridIoMessageFactory.java | 11 ++++++----- .../dht/preloader/GridDhtPartitionSupplyMessageV2.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5352825f/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index 14f0548..04f6b5f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -891,11 +891,7 @@ public class GridIoMessageFactory implements MessageFactory { break; - case 120: - msg = new GridDhtPartitionSupplyMessageV2(); - - break; - + // [120..123] - DR case 124: msg = new GridMessageCollection<>(); @@ -1066,6 +1062,11 @@ public class GridIoMessageFactory implements MessageFactory { break; + case 158: + msg = new GridDhtPartitionSupplyMessageV2(); + + break; + // [-3..119] [124..129] [-23..-27] [-36..-55]- this // [120..123] - DR // [-4..-22, -30..-35] - SQL http://git-wip-us.apache.org/repos/asf/ignite/blob/5352825f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java index a775766..b6bff0e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java @@ -143,7 +143,7 @@ public class GridDhtPartitionSupplyMessageV2 extends GridDhtPartitionSupplyMessa /** {@inheritDoc} */ @Override public short directType() { - return 120; + return 158; } /** {@inheritDoc} */
