Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0D386958F for ; Sat, 28 Jul 2012 18:45:28 +0000 (UTC) Received: (qmail 58028 invoked by uid 500); 28 Jul 2012 18:45:27 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 57616 invoked by uid 500); 28 Jul 2012 18:45:26 -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 57568 invoked by uid 99); 28 Jul 2012 18:45:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Jul 2012 18:45:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sat, 28 Jul 2012 18:45:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B262923888FE for ; Sat, 28 Jul 2012 18:44:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1366734 - /tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java Date: Sat, 28 Jul 2012 18:44:39 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120728184439.B262923888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sat Jul 28 18:44:39 2012 New Revision: 1366734 URL: http://svn.apache.org/viewvc?rev=1366734&view=rev Log: Deprecate unused parameter Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java 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=1366734&r1=1366733&r2=1366734&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java Sat Jul 28 18:44:39 2012 @@ -89,7 +89,7 @@ public class RpcChannel implements Chann channelOptions & ~Channel.SEND_OPTIONS_SYNCHRONIZED_ACK; RpcCollectorKey key = new RpcCollectorKey(UUIDGenerator.randomUUID(false)); - RpcCollector collector = new RpcCollector(key,rpcOptions,destination.length,timeout); + RpcCollector collector = new RpcCollector(key,rpcOptions,destination.length); try { synchronized (collector) { if ( rpcOptions != NO_REPLY ) responseMap.put(key, collector); @@ -231,15 +231,29 @@ public class RpcChannel implements Chann public final RpcCollectorKey key; public final int options; public int destcnt; + /** + * @deprecated Unused - will be removed in Tomcat 8.0.x + */ + @Deprecated public final long timeout; - public RpcCollector(RpcCollectorKey key, int options, int destcnt, long timeout) { + /** + * @deprecated Use {@link RpcCollector#RpcCollector(RpcCollectorKey, + * int, int)} + */ + @Deprecated + public RpcCollector(RpcCollectorKey key, int options, int destcnt, + long timeout) { this.key = key; this.options = options; this.destcnt = destcnt; this.timeout = timeout; } + public RpcCollector(RpcCollectorKey key, int options, int destcnt) { + this(key, options, destcnt, 0); + } + public void addResponse(Serializable message, Member sender){ Response resp = new Response(sender,message); responses.add(resp); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org