Merge branches 'ignite-104' and 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6b52a234
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b52a234
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b52a234
Branch: refs/heads/ignite-104
Commit: 6b52a234f8c8f845a088df225220d6dde30a5e3f
Parents: 5cdd244
Author: Valentin Kulichenko <vkuliche...@gridgain.com>
Authored: Fri Jul 31 13:40:21 2015 -0700
Committer: Valentin Kulichenko <vkuliche...@gridgain.com>
Committed: Fri Jul 31 13:40:21 2015 -0700
----------------------------------------------------------------------
.../managers/communication/GridIoManager.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b52a234/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 479d116..d125eef 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
@@ -1227,7 +1227,7 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Serializa
*/
public void send(ClusterNode node, GridTopic topic, Message msg, byte plc,
IgniteInClosure<IgniteException> ackClosure) throws
IgniteCheckedException {
- send(node, topic, topic.ordinal(), msg, plc, false, 0, false,
ackClosure);
+ send(node, topic, topic.ordinal(), msg, plc, false, false, 0, false,
ackClosure);
}
/**
@@ -1250,7 +1250,7 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Serializa
throws IgniteCheckedException {
assert timeout > 0 || skipOnTimeout;
- send(nodes, topic, -1, msg, plc, true, false, timeout, skipOnTimeout);
+ send(nodes, topic, -1, msg, plc, true, false, timeout, skipOnTimeout,
null);
}
/**
@@ -1263,7 +1263,7 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Serializa
*/
public void send(ClusterNode node, Object topic, Message msg, byte plc,
IgniteInClosure<IgniteException> ackClosure)
throws IgniteCheckedException {
- send(node, topic, -1, msg, plc, false, 0, false, ackClosure);
+ send(node, topic, -1, msg, plc, false, false, 0, false, ackClosure);
}
/**
@@ -1279,7 +1279,7 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Serializa
Message msg,
byte plc
) throws IgniteCheckedException {
- send(nodes, topic, -1, msg, plc, false, false, 0, false);
+ send(nodes, topic, -1, msg, plc, false, false, 0, false, null);
}
/**
@@ -1295,7 +1295,7 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Serializa
Message msg,
byte plc
) throws IgniteCheckedException {
- send(nodes, topic, topic.ordinal(), msg, plc, false, false, 0, false);
+ send(nodes, topic, topic.ordinal(), msg, plc, false, false, 0, false,
null);
}
/**
@@ -1319,7 +1319,7 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Serializa
) throws IgniteCheckedException {
assert timeout > 0 || skipOnTimeout;
- send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout,
ackClosure);
+ send(node, topic, (byte)-1, msg, plc, true, false, timeout,
skipOnTimeout, ackClosure);
}
/**
@@ -1508,7 +1508,7 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Serializa
if (node == null)
throw new IgniteCheckedException("Failed to send message to node
(has node left grid?): " + nodeId);
- send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout,
ackClosure);
+ send(node, topic, (byte)-1, msg, plc, true, false, timeout,
skipOnTimeout, ackClosure);
}
/**
@@ -1532,7 +1532,8 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Serializa
boolean ordered,
boolean seq,
long timeout,
- boolean skipOnTimeout
+ boolean skipOnTimeout,
+ IgniteInClosure<IgniteException> ackClosure
) throws IgniteCheckedException {
assert nodes != null;
assert topic != null;
@@ -1547,7 +1548,7 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Serializa
// messages to one node vs. many.
if (!nodes.isEmpty()) {
for (ClusterNode node : nodes)
- send(node, topic, topicOrd, msg, plc, ordered, seq,
timeout, skipOnTimeout, null);
+ send(node, topic, topicOrd, msg, plc, ordered, seq,
timeout, skipOnTimeout, ackClosure);
}
else if (log.isDebugEnabled())
log.debug("Failed to send message to empty nodes collection
[topic=" + topic + ", msg=" +
