From dev-return-111347-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org Tue Nov 09 17:09:15 2010 Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 95381 invoked from network); 9 Nov 2010 17:09:14 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Nov 2010 17:09:14 -0000 Received: (qmail 76633 invoked by uid 500); 9 Nov 2010 17:09:43 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 76562 invoked by uid 500); 9 Nov 2010 17:09:43 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 76553 invoked by uid 99); 9 Nov 2010 17:09:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Nov 2010 17:09:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Nov 2010 17:09:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 12A4223888CD; Tue, 9 Nov 2010 17:08:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1033102 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/RpcChannel.java webapps/docs/changelog.xml Date: Tue, 09 Nov 2010 17:08:25 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101109170826.12A4223888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Tue Nov 9 17:08:25 2010 New Revision: 1033102 URL: http://svn.apache.org/viewvc?rev=1033102&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50184 Add an option to the RpcChannel to enable the Channel send options to be set for the reply message. Based on a patch by Ariel. Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java?rev=1033102&r1=1033101&r2=1033102&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java Tue Nov 9 17:08:25 2010 @@ -44,7 +44,8 @@ public class RpcChannel implements Chann private Channel channel; private RpcCallback callback; private byte[] rpcId; - + private int replyMessageOptions = 0; + private HashMap responseMap = new HashMap(); /** @@ -130,7 +131,8 @@ public class RpcChannel implements Chann rmsg.reply = true; rmsg.message = reply; try { - channel.send(new Member[] {sender}, rmsg,0); + channel.send(new Member[] {sender}, rmsg, + replyMessageOptions & ~Channel.SEND_OPTIONS_SYNCHRONIZED_ACK); }catch ( Exception x ) { log.error("Unable to send back reply in RpcChannel.",x); } @@ -178,7 +180,14 @@ public class RpcChannel implements Chann this.rpcId = rpcId; } + public int getReplyMessageOptions() { + return replyMessageOptions; + } + public void setReplyMessageOptions(int replyMessageOptions) { + this.replyMessageOptions = replyMessageOptions; + } + /** * * Class that holds all response. Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1033102&r1=1033101&r2=1033102&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 9 17:08:25 2010 @@ -163,6 +163,11 @@ If maxInactiveInterval is negative, an access message is not sending. (kfujino) + + 50184: Add an option to the RpcChannel to enable the Channel + send options to be set for the reply message. Based on a patch by Ariel. + (markt)) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org