ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: fix
Date Fri, 03 Mar 2017 07:34:33 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2.0-io-fix df102a369 -> ec7993968


fix


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

Branch: refs/heads/ignite-2.0-io-fix
Commit: ec79939684b000ae4544252654dbb4bddcd7ad4c
Parents: df102a3
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Mar 3 10:34:25 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Mar 3 10:34:25 2017 +0300

----------------------------------------------------------------------
 .../internal/managers/communication/GridIoManager.java       | 8 ++++----
 .../managers/communication/GridIoManagerSelfTest.java        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ec799396/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 e104986..5e91ea9 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
@@ -1431,9 +1431,9 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
      * @param skipOnTimeout Whether message can be skipped on timeout.
      * @throws IgniteCheckedException Thrown in case of any errors.
      */
-    public void sendOrderedMessage(
+    void sendOrderedMessageToGridTopic(
         Collection<? extends ClusterNode> nodes,
-        Object topic,
+        GridTopic topic,
         Message msg,
         byte plc,
         long timeout,
@@ -1442,7 +1442,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         throws IgniteCheckedException {
         assert timeout > 0 || skipOnTimeout;
 
-        send(nodes, topic, -1, msg, plc, true, timeout, skipOnTimeout);
+        send(nodes, topic, topic.ordinal(), msg, plc, true, timeout, skipOnTimeout);
     }
 
     /**
@@ -1557,7 +1557,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
             dep != null ? dep.participants() : null);
 
         if (ordered)
-            sendOrderedMessage(nodes, TOPIC_COMM_USER, ioMsg, PUBLIC_POOL, timeout, true);
+            sendOrderedMessageToGridTopic(nodes, TOPIC_COMM_USER, ioMsg, PUBLIC_POOL, timeout,
true);
         else if (loc) {
             send(F.first(nodes),
                 TOPIC_COMM_USER,

http://git-wip-us.apache.org/repos/asf/ignite/blob/ec799396/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index ca35a0d..f4257a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -161,7 +161,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
             // No-op. We are using mocks so real sending is impossible.
         }
 
-        verify(ioMgr).sendOrderedMessage(
+        verify(ioMgr).sendOrderedMessageToGridTopic(
             argThat(new IsEqualCollection(F.asList(locNode, rmtNode))),
             eq(GridTopic.TOPIC_COMM_USER),
             any(GridIoUserMessage.class),


Mime
View raw message