Fix FindBugs warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059560 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 ca20adc..6d44491 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/PooledSender.java
+++ b/java/org/apache/catalina/tribes/transport/PooledSender.java
@@ -88,10 +88,12 @@ public abstract class PooledSender extends AbstractSender implements MultiPointS
         return (queue==null)?false:queue.checkIdleKeepAlive();
     }
 
+    @Override
     public void add(Member member) {
         // no op, senders created upon demands
     }
 
+    @Override
     public void remove(Member member) {
         //no op for now, should not cancel out any keys
         //can create serious sync issues
@@ -100,7 +102,7 @@ public abstract class PooledSender extends AbstractSender implements MultiPointS
     }
     //  ----------------------------------------------------- Inner Class
 
-    private class SenderQueue {
+    private static class SenderQueue {
         private int limit = 25;
 
         PooledSender parent = null;

diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
index 3e70504..804bb9e 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
@@ -82,7 +82,11 @@ public class BioReceiver extends ReceiverBase implements Runnable {
         setListen(false);
         try {
             this.serverSocket.close();
-        } catch (Exception x) {/* Ignore */}
+        } catch (Exception x) {
+            if (log.isDebugEnabled()) {
+                log.debug("Failed to close socket", x);
+            }
+        }
         super.stop();
     }
 

diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
index 50a0edf..321d865 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
@@ -67,8 +67,20 @@ public class BioReplicationTask extends AbstractRxTask {
         } catch ( Exception x ) {
             log.error("Unable to service bio socket", x);
         }finally {
-            try {socket.close();}catch ( Exception e){/* Ignore */}
-            try {reader.close();}catch ( Exception e){/* Ignore */}
+            try {
+                socket.close();
+            }catch (Exception e) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Failed to close socket", e);
+                }
+            }
+            try {
+                reader.close();
+            }catch (Exception e) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Failed to close reader", e);
+                }
+            }
             reader = null;
             socket = null;
         }
@@ -158,8 +170,20 @@ public class BioReplicationTask extends AbstractRxTask {
     @Override
     public void close() {
         setDoRun(false);
-        try {socket.close();}catch ( Exception e){/* Ignore */}
-        try {reader.close();}catch ( Exception e){/* Ignore */}
+        try {
+            socket.close();
+        }catch (Exception e) {
+            if (log.isDebugEnabled()) {
+                log.debug("Failed to close socket", e);
+            }
+        }
+        try {
+            reader.close();
+        }catch (Exception e) {
+            if (log.isDebugEnabled()) {
+                log.debug("Failed to close reader", e);
+            }
+        }
         reader = null;
         socket = null;
         super.close();

diff --git a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
index d7c2372..e855a37 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
+++ b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
@@ -288,7 +288,13 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
     @Override
     public void finalize() {
         try {disconnect(); }catch ( Exception e){/*Ignore*/}
-        try {selector.close();} catch (Exception e) {/*Ignore*/}
+        try {
+            selector.close();
+        }catch (Exception e) {
+            if (log.isDebugEnabled()) {
+                log.debug("Failed to close selector", e);
+            }
+        }
     }
 
     @Override

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index e377121..5fc440f 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1060,8 +1060,26 @@ public class NioEndpoint extends AbstractEndpoint {
                 if (ka!=null) handler.release(ka.getChannel());
                 else handler.release((SocketChannel)key.channel());
                 if (key.isValid()) key.cancel();
-                if (key.channel().isOpen()) try {key.channel().close();}catch (Exception ignore){}
-                try {if (ka!=null) ka.getSocket().close(true);}catch (Exception ignore){}
+                if (key.channel().isOpen()) {
+                    try {
+                        key.channel().close();
+                    } catch (Exception e) {
+                        if (log.isDebugEnabled()) {
+                            log.debug(sm.getString(
+                                    "endpoint.debug.channelCloseFail"), e);
+                        }
+                    }
+                }
+                try {
+                    if (ka!=null) {
+                        ka.getSocket().close(true);
+                    }
+                } catch (Exception e){
+                    if (log.isDebugEnabled()) {
+                        log.debug(sm.getString(
+                                "endpoint.debug.socketCloseFail"), e);
+                    }
+                }
                 try {if (ka!=null && ka.getSendfileData()!=null && ka.getSendfileData().fchannel!=null && ka.getSendfileData().fchannel.isOpen()) ka.getSendfileData().fchannel.close();}catch (Exception ignore){}
                 if (ka!=null) {
                     ka.reset();
@@ -1069,8 +1087,7 @@ public class NioEndpoint extends AbstractEndpoint {
                 }
             } catch (Throwable e) {
                 ExceptionUtils.handleThrowable(e);
-                if ( log.isDebugEnabled() ) log.error("",e);
-                // Ignore
+                if (log.isDebugEnabled()) log.error("",e);
             }
         }
         /**

diff --git a/java/org/apache/tomcat/util/net/res/LocalStrings.properties b/java/org/apache/tomcat/util/net/res/LocalStrings.properties
index 5e7941a..9095510 100644 (file)
--- a/java/org/apache/tomcat/util/net/res/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/res/LocalStrings.properties
@@ -43,3 +43,5 @@ endpoint.sendfile.addfail=Sendfile failure: [{0}] {1}
 endpoint.sendfile.nosupport=Disabling sendfile, since either the APR version or the system doesn't support it
 endpoint.warn.noInsecureReneg=Secure renegotation is not supported by the SSL library {0}
 endpoint.warn.unlockAcceptorFailed=Acceptor thread [{0}] failed to unlock. Forcing hard socket shutdown.
+endpoint.debug.channelCloseFail=Failed to close channel
+endpoint.debug.socketCloseFail=Failed to close socket