tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1366734 - /tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
Date Sat, 28 Jul 2012 18:44:39 GMT
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


Mime
View raw message