From e9ce5abfab2ff4933cec0487c8c70140cce99076 Mon Sep 17 00:00:00 2001 From: fhanik Date: Thu, 10 Feb 2011 18:59:08 +0000 Subject: [PATCH] remove retry from the API. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1069530 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/tribes/group/ExtendedRpcCallback.java | 9 ++++----- java/org/apache/catalina/tribes/group/RpcChannel.java | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/tribes/group/ExtendedRpcCallback.java b/java/org/apache/catalina/tribes/group/ExtendedRpcCallback.java index d6e95cbf7..e24e48416 100644 --- a/java/org/apache/catalina/tribes/group/ExtendedRpcCallback.java +++ b/java/org/apache/catalina/tribes/group/ExtendedRpcCallback.java @@ -21,24 +21,23 @@ import java.io.Serializable; import org.apache.catalina.tribes.Member; /** * Extension to the {@link RpcCallback} interface. Allows a RPC messenger to get a confirmation if the reply - * was sent successfully to the original sender. + * was sent successfully to the original sender. * @author fhanik * */ public interface ExtendedRpcCallback extends RpcCallback { /** - * + * The reply failed. * @param request - the original message that requested the reply * @param response - the reply message to the original message * @param sender - the sender requested that reply * @param reason - the reason the reply failed - * @return true if the callback would like to reattempt the reply, false otherwise */ - public boolean replyFailed(Serializable request, Serializable response, Member sender, Exception reason); + public void replyFailed(Serializable request, Serializable response, Member sender, Exception reason); /** - * + * The reply succeeded * @param request - the original message that requested the reply * @param response - the reply message to the original message * @param sender - the sender requested that reply diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java b/java/org/apache/catalina/tribes/group/RpcChannel.java index b33214aba..39c4c0453 100644 --- a/java/org/apache/catalina/tribes/group/RpcChannel.java +++ b/java/org/apache/catalina/tribes/group/RpcChannel.java @@ -159,9 +159,8 @@ public class RpcChannel implements ChannelListener{ finished = true; }catch ( Exception x ) { if (excallback != null && !asyncReply) { - finished = !excallback.replyFailed(rmsg.message, reply, sender, x); + excallback.replyFailed(rmsg.message, reply, sender, x); } else { - finished = true; log.error("Unable to send back reply in RpcChannel.",x); } } -- 2.11.0