Generics for o.a.c.tribes.transport

Fix various Eclipse warnings (unused code etc)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@729325 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/tribes/transport/PooledSender.java b/java/org/apache/catalina/tribes/transport/PooledSender.java
index 26afc77..01dd3bd 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/PooledSender.java
+++ b/java/org/apache/catalina/tribes/transport/PooledSender.java
@@ -101,17 +101,17 @@ public abstract class PooledSender extends AbstractSender implements MultiPointS
 
         PooledSender parent = null;
 
-        private List notinuse = null;
+        private List<DataSender> notinuse = null;
 
-        private List inuse = null;
+        private List<DataSender> inuse = null;
 
         private boolean isOpen = true;
 
         public SenderQueue(PooledSender parent, int limit) {
             this.limit = limit;
             this.parent = parent;
-            notinuse = new java.util.LinkedList();
-            inuse = new java.util.LinkedList();
+            notinuse = new java.util.LinkedList<DataSender>();
+            inuse = new java.util.LinkedList<DataSender>();
         }
 
         /**
@@ -158,7 +158,7 @@ public abstract class PooledSender extends AbstractSender implements MultiPointS
                 if (notinuse.size() == 0 && inuse.size() < limit) {
                     sender = parent.getNewDataSender();
                 } else if (notinuse.size() > 0) {
-                    sender = (DataSender) notinuse.remove(0);
+                    sender = notinuse.remove(0);
                 }
                 if (sender != null) {
                     inuse.add(sender);

diff --git a/java/org/apache/catalina/tribes/transport/ReceiverBase.java b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
index bf24f8e..da1c32f 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/ReceiverBase.java
+++ b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
@@ -227,7 +227,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R
                     throw x;
                 }
                 portstart++;
-                try {Thread.sleep(25);}catch( InterruptedException ti){Thread.currentThread().interrupted();}
+                try {Thread.sleep(25);}catch( InterruptedException ti){Thread.interrupted();}
                 retries = bind(socket,portstart,retries);
             }
         }
@@ -258,7 +258,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R
                     throw x;
                 }
                 portstart++;
-                try {Thread.sleep(25);}catch( InterruptedException ti){Thread.currentThread().interrupted();}
+                try {Thread.sleep(25);}catch( InterruptedException ti){Thread.interrupted();}
                 retries = bindUdp(socket,portstart,retries);
             }
         }
@@ -444,7 +444,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R
     }
 
     public void setLog(Log log) {
-        this.log = log;
+        ReceiverBase.log = log;
     }
 
     public void setPool(RxTaskPool pool) {

diff --git a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
index cb3e854..b0acc51 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
+++ b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
@@ -33,7 +33,6 @@ import org.apache.catalina.tribes.transport.nio.PooledParallelSender;
  * @version $Revision$ $Date$
  */
 public class ReplicationTransmitter implements ChannelSender {
-    private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(ReplicationTransmitter.class);
 
     /**
      * The descriptive information about this implementation.

diff --git a/java/org/apache/catalina/tribes/transport/RxTaskPool.java b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
index cf56d00..d3639cf 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/RxTaskPool.java
+++ b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
@@ -19,7 +19,6 @@ package org.apache.catalina.tribes.transport;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.ThreadFactory;
 
 /**
  * @author not attributable
@@ -34,22 +33,17 @@ public class RxTaskPool
      * through a FIFO idle queue.
      */
 
-    List idle = new LinkedList();
-    List used = new LinkedList();
+    List<AbstractRxTask> idle = new LinkedList<AbstractRxTask>();
+    List<AbstractRxTask> used = new LinkedList<AbstractRxTask>();
     
     Object mutex = new Object();
     boolean running = true;
     
-    private static int counter = 1;
     private int maxTasks;
     private int minTasks;
     
     private TaskCreator creator = null;
 
-    private static synchronized int inc() {
-        return counter++;
-    }
-
     
     public RxTaskPool (int maxTasks, int minTasks, TaskCreator creator) throws Exception {
         // fill up the pool with worker threads
@@ -78,7 +72,7 @@ public class RxTaskPool
             while ( worker == null && running ) {
                 if (idle.size() > 0) {
                     try {
-                        worker = (AbstractRxTask) idle.remove(0);
+                        worker = idle.remove(0);
                     } catch (java.util.NoSuchElementException x) {
                         //this means that there are no available workers
                         worker = null;
@@ -87,7 +81,7 @@ public class RxTaskPool
                     worker = creator.createRxTask();
                     configureTask(worker);
                 } else {
-                    try { mutex.wait(); } catch ( java.lang.InterruptedException x ) {Thread.currentThread().interrupted();}
+                    try { mutex.wait(); } catch ( java.lang.InterruptedException x ) {Thread.interrupted();}
                 }
             }//while
             if ( worker != null ) used.add(worker);
@@ -132,9 +126,9 @@ public class RxTaskPool
     public void stop() {
         running = false;
         synchronized (mutex) {
-            Iterator i = idle.iterator();
+            Iterator<AbstractRxTask> i = idle.iterator();
             while ( i.hasNext() ) {
-                AbstractRxTask worker = (AbstractRxTask)i.next();
+                AbstractRxTask worker = i.next();
                 returnWorker(worker);
                 i.remove();
             }

diff --git a/java/org/apache/catalina/tribes/transport/SenderState.java b/java/org/apache/catalina/tribes/transport/SenderState.java
index c8eebbf..9e9ce90 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/SenderState.java
+++ b/java/org/apache/catalina/tribes/transport/SenderState.java
@@ -32,24 +32,19 @@ public class SenderState {
     
     public static final int READY = 0;
     public static final int SUSPECT = 1;
-    public static final int FAILING = 2;
-    /**
-     * The descriptive information about this implementation.
-     */
-    private static final String info = "SenderState/1.0";
-    
+    public static final int FAILING = 2;    
     
-    protected static HashMap memberStates = new HashMap();
+    protected static HashMap<Member, SenderState> memberStates = new HashMap<Member, SenderState>();
     
     public static SenderState getSenderState(Member member) {
         return getSenderState(member,true);
     }
 
     public static SenderState getSenderState(Member member, boolean create) {
-        SenderState state = (SenderState)memberStates.get(member);
+        SenderState state = memberStates.get(member);
         if ( state == null && create) {
             synchronized ( memberStates ) {
-                state = (SenderState)memberStates.get(member);
+                state = memberStates.get(member);
                 if ( state == null ) {
                     state = new SenderState();
                     memberStates.put(member,state);