ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [3/3] ignite git commit: ignite-3477-master fix GridMessagingSelfTest.testAsync
Date Tue, 28 Mar 2017 07:44:43 GMT
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/58e814eb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58e814eb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58e814eb

Branch: refs/heads/ignite-3477-master
Commit: 58e814eba4327e4ef6a95a220e8c30668fc95383
Parents: d91a72c
Author: Dmitriy Govorukhin <dgovorukhin@gridgain.com>
Authored: Mon Mar 27 17:33:40 2017 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Tue Mar 28 10:44:01 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/58e814eb/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;
                 }
             }
 


Mime
View raw message