Author: markt
Date: Sat Jul 28 18:47:00 2012
New Revision: 1366736
URL: http://svn.apache.org/viewvc?rev=1366736&view=rev
Log:
Deprecate unused code
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1366734
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java?rev=1366736&r1=1366735&r2=1366736&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
Sat Jul 28 18:47:00 2012
@@ -88,7 +88,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);
@@ -230,15 +230,29 @@ public class RpcChannel implements Chann
public RpcCollectorKey key;
public int options;
public int destcnt;
+ /**
+ * @deprecated Unused - will be removed in Tomcat 8.0.x
+ */
+ @Deprecated
public 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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
