ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/3] ignite git commit: ignite-1.9-fix
Date Thu, 02 Mar 2017 09:51:00 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.9-fix 751ec7dfe -> 524935f93


ignite-1.9-fix


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9c247434
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9c247434
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9c247434

Branch: refs/heads/ignite-1.9-fix
Commit: 9c247434504e10076870d928bd9028ef0312705e
Parents: 751ec7d
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Mar 2 12:22:05 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Mar 2 12:22:05 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/managers/communication/GridIoManager.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9c247434/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index ecabb27..f028c94 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1262,6 +1262,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         assert node != null;
         assert topic != null;
         assert msg != null;
+        assert !async || msg instanceof GridIoUserMessage : msg; // Async execution was added
only for IgniteMessaging.
 
         GridIoMessage ioMsg = new GridIoMessage(plc, topic, topicOrd, msg, ordered, timeout,
skipOnTimeout);
 
@@ -1275,11 +1276,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
 
             if (ordered)
                 processOrderedMessage(locNodeId, ioMsg, plc, null);
-            else if (async) {
-                assert msg instanceof GridIoUserMessage : ioMsg; // Async execution was added
only for IgniteMessaging.
-
+            else if (async)
                 processRegularMessage(locNodeId, ioMsg, plc, NOOP);
-            }
             else
                 processRegularMessage0(ioMsg, locNodeId);
 


Mime
View raw message