You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/05/15 13:06:04 UTC
incubator-ignite git commit: IGNITE-709 Rename newMessageOnRingEnd()
to ackMessage()
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709_2 980dd4725 -> 7ee19cd53
IGNITE-709 Rename newMessageOnRingEnd() to ackMessage()
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ee19cd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ee19cd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ee19cd5
Branch: refs/heads/ignite-709_2
Commit: 7ee19cd531c5b8640c38241283418cfff687d0a0
Parents: 980dd47
Author: sevdokimov <se...@gridgain.com>
Authored: Fri May 15 14:05:58 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Fri May 15 14:05:58 2015 +0300
----------------------------------------------------------------------
.../internal/managers/discovery/CustomMessageWrapper.java | 2 +-
.../apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java | 5 ++++-
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ee19cd5/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
index 00bfb8c..0afb6cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
@@ -38,7 +38,7 @@ class CustomMessageWrapper implements DiscoverySpiCustomMessage {
}
/** {@inheritDoc} */
- @Nullable @Override public DiscoverySpiCustomMessage newMessageOnRingEnd() {
+ @Nullable @Override public DiscoverySpiCustomMessage ackMessage() {
DiscoveryCustomMessage res = delegate.ackMessage();
return res == null ? null : new CustomMessageWrapper(res);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ee19cd5/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
index 8d92deb..72ba9db 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
@@ -22,11 +22,14 @@ import org.jetbrains.annotations.*;
import java.io.*;
/**
+ * Message to send across ring.
*
+ * @see org.apache.ignite.internal.managers.discovery.GridDiscoveryManager#sendCustomEvent(
+ * org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage)
*/
public interface DiscoverySpiCustomMessage extends Serializable {
/**
* Called when message passed the ring.
*/
- @Nullable public DiscoverySpiCustomMessage newMessageOnRingEnd();
+ @Nullable public DiscoverySpiCustomMessage ackMessage();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ee19cd5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index b445b2c..7ee3e3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -4574,7 +4574,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
try {
DiscoverySpiCustomMessage msgObj = marsh.unmarshal(msg.messageBytes(), U.gridClassLoader());
- DiscoverySpiCustomMessage nextMsg = msgObj.newMessageOnRingEnd();
+ DiscoverySpiCustomMessage nextMsg = msgObj.ackMessage();
if (nextMsg != null)
addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), marsh.marshal(nextMsg)));