From 6330416310b7fe3a0e1a4cfd9b0fcad9a3a70732 Mon Sep 17 00:00:00 2001 From: fhanik Date: Wed, 9 Feb 2011 17:39:24 +0000 Subject: [PATCH] https://issues.apache.org/bugzilla/show_bug.cgi?id=50667 Move the callback outside try/catch to avoid duplicate callbacks git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1068989 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/tribes/group/RpcChannel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java b/java/org/apache/catalina/tribes/group/RpcChannel.java index c40aaba63..38f63c501 100644 --- a/java/org/apache/catalina/tribes/group/RpcChannel.java +++ b/java/org/apache/catalina/tribes/group/RpcChannel.java @@ -158,9 +158,6 @@ public class RpcChannel implements ChannelListener{ channel.send(new Member[] {sender}, rmsg,replyMessageOptions & ~Channel.SEND_OPTIONS_SYNCHRONIZED_ACK); } finished = true; - if (excallback != null && !asyncReply) { - excallback.replySucceeded(rmsg.message, reply, sender); - } }catch ( Exception x ) { if (excallback != null && !asyncReply) { finished = !excallback.replyFailed(rmsg.message, reply, sender, x); @@ -169,6 +166,9 @@ public class RpcChannel implements ChannelListener{ log.error("Unable to send back reply in RpcChannel.",x); } } + if (finished && excallback != null && !asyncReply) { + excallback.replySucceeded(rmsg.message, reply, sender); + } } }//end if } -- 2.11.0