Clean-up

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

diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
index 75e5236..2685f9a 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
@@ -39,6 +39,7 @@ public class BioReceiver extends ReceiverBase implements Runnable {
     protected ServerSocket serverSocket;
 
     public BioReceiver() {
+        // NO-OP
     }
 
     /**
@@ -69,6 +70,7 @@ public class BioReceiver extends ReceiverBase implements Runnable {
         }
     }
     
+    @Override
     public AbstractRxTask createRxTask() {
         return getReplicationThread();
     }
@@ -89,7 +91,7 @@ public class BioReceiver extends ReceiverBase implements Runnable {
         setListen(false);
         try {
             this.serverSocket.close();
-        }catch ( Exception x ) {}
+        } catch (Exception x) {/* Ignore */}
         super.stop();
     }
 
@@ -103,6 +105,7 @@ public class BioReceiver extends ReceiverBase implements Runnable {
     }
 
 
+    @Override
     public void run() {
         try {
             listen();

diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
index 9a8d2ba..b0edbbb 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
@@ -58,6 +58,7 @@ public class BioReplicationTask extends AbstractRxTask {
     }
 
     // loop forever waiting for work to do
+    @Override
     public synchronized void run()
     {
         if ( socket == null ) return;
@@ -66,8 +67,8 @@ public class BioReplicationTask extends AbstractRxTask {
         } catch ( Exception x ) {
             log.error("Unable to service bio socket");
         }finally {
-            try {socket.close();}catch ( Exception ignore){}
-            try {reader.close();}catch ( Exception ignore){}
+            try {socket.close();}catch ( Exception e){/* Ignore */}
+            try {reader.close();}catch ( Exception e){/* Ignore */}
             reader = null;
             socket = null;
         }
@@ -158,8 +159,8 @@ public class BioReplicationTask extends AbstractRxTask {
     @Override
     public void close() {
         setDoRun(false);
-        try {socket.close();}catch ( Exception ignore){}
-        try {reader.close();}catch ( Exception ignore){}
+        try {socket.close();}catch ( Exception e){/* Ignore */}
+        try {reader.close();}catch ( Exception e){/* Ignore */}
         reader = null;
         socket = null;
         super.close();

diff --git a/java/org/apache/catalina/tribes/transport/bio/BioSender.java b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
index 4f38cfe..60c80ea 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/bio/BioSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
@@ -70,6 +70,7 @@ public class BioSender extends AbstractSender {
     // ------------------------------------------------------------- Constructor
     
     public BioSender()  {
+        // NO-OP
     }
 
 
@@ -203,6 +204,7 @@ public class BioSender extends AbstractSender {
                 try {
                     socket.close();
                 } catch (IOException x) {
+                    // Ignore
                 } finally {
                     socket = null;
                     soOut = null;

diff --git a/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java b/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
index 101a00e..949e428 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
@@ -38,6 +38,7 @@ import org.apache.catalina.tribes.transport.MultiPointSender;
  */
 public class MultipointBioSender extends AbstractSender implements MultiPointSender {
     public MultipointBioSender() {
+        // NO-OP
     }
     
     protected long selectTimeout = 1000; 
@@ -110,10 +111,14 @@ public class MultipointBioSender extends AbstractSender implements MultiPointSen
         if ( x != null ) throw x;
     }
 
+    @Override
     public void add(Member member) {
-
+        // NO-OP
+        // Members are defined by the array of members specified in the call to
+        // sendMessage()
     }
 
+    @Override
     public void remove(Member member) {
         //disconnect senders
         BioSender sender = bioSenders.remove(member);
@@ -123,13 +128,13 @@ public class MultipointBioSender extends AbstractSender implements MultiPointSen
 
     @Override
     public synchronized void disconnect() {
-        try {close(); }catch (Exception x){}
+        try {close(); }catch (Exception x){/* Ignore */}
         setConnected(false);
     }
 
     @Override
     public void finalize() {
-        try {disconnect(); }catch ( Exception ignore){}
+        try {disconnect(); }catch ( Exception e){/* Ignore */}
     }
 
 

diff --git a/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java b/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
index b67f526..8f96d06 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
@@ -38,8 +38,10 @@ public class PooledMultiSender extends PooledSender {
     
 
     public PooledMultiSender() {
+        // NO-OP
     }
     
+    @Override
     public void sendMessage(Member[] destination, ChannelMessage msg) throws ChannelException {
         MultiPointSender sender = null;
         try {