Repository: ignite Updated Branches: refs/heads/ignite-3477-master 2c480b4fe -> 7b0eb4181
ignite-3477-master fix GridMessagingSelfTest.testAsync Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d7eb44d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d7eb44d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d7eb44d Branch: refs/heads/ignite-3477-master Commit: 6d7eb44d2f40e795e7bec77dccf4553784766361 Parents: fcc4906 Author: Dmitriy Govorukhin <[email protected]> Authored: Mon Mar 27 17:33:40 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Mon Mar 27 17:33:40 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/messaging/GridMessagingSelfTest.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6d7eb44d/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index 3f66c5d..aa07988 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@ -44,6 +44,8 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.continuous.StartRoutineDiscoveryMessage; import org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessage; +import org.apache.ignite.internal.processors.marshaller.MappingAcceptedMessage; +import org.apache.ignite.internal.processors.marshaller.MappingProposedMessage; import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.typedef.P2; import org.apache.ignite.internal.util.typedef.PA; @@ -1154,13 +1156,22 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser synchronized (mux) { if (blockCustomEvt) { DiscoveryCustomMessage msg0 = GridTestUtils.getFieldValue(msg, "delegate"); + + if (msg0 instanceof MappingProposedMessage || msg0 instanceof MappingAcceptedMessage){ + super.sendCustomEvent(msg); + + return; + } + if (msg0 instanceof StopRoutineDiscoveryMessage || msg0 instanceof StartRoutineDiscoveryMessage) { log.info("Block custom message: " + msg0); + blockedMsgs.add(msg); mux.notifyAll(); + + return; } - return; } }
