Author: markt
Date: Sun Jan 16 13:54:28 2011
New Revision: 1059560
URL: http://svn.apache.org/viewvc?rev=1059560&view=rev
Log:
Fix FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java?rev=1059560&r1=1059559&r2=1059560&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
Sun Jan 16 13:54:28 2011
@@ -88,10 +88,12 @@ public abstract class PooledSender exten
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 exten
}
// ----------------------------------------------------- Inner Class
- private class SenderQueue {
+ private static class SenderQueue {
private int limit = 25;
PooledSender parent = null;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=1059560&r1=1059559&r2=1059560&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Sun Jan 16 13:54:28 2011
@@ -82,7 +82,11 @@ public class BioReceiver extends Receive
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();
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java?rev=1059560&r1=1059559&r2=1059560&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
Sun Jan 16 13:54:28 2011
@@ -67,8 +67,20 @@ public class BioReplicationTask extends
} 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
@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();
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=1059560&r1=1059559&r2=1059560&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
Sun Jan 16 13:54:28 2011
@@ -288,7 +288,13 @@ public class ParallelNioSender extends A
@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
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1059560&r1=1059559&r2=1059560&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun Jan 16
13:54:28 2011
@@ -1060,8 +1060,26 @@ public class NioEndpoint extends Abstrac
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 Abstrac
}
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
- if ( log.isDebugEnabled() ) log.error("",e);
- // Ignore
+ if (log.isDebugEnabled()) log.error("",e);
}
}
/**
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=1059560&r1=1059559&r2=1059560&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Sun Jan 16 13:54:28 2011
@@ -43,3 +43,5 @@ endpoint.sendfile.addfail=Sendfile failu
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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
