Author: markt
Date: Fri Oct 26 21:33:31 2012
New Revision: 1402671
URL: http://svn.apache.org/viewvc?rev=1402671&view=rev
Log:
Fix resource leak warnings reported by Eclipse
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java?rev=1402671&r1=1402670&r2=1402671&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java Fri
Oct 26 21:33:31 2012
@@ -810,10 +810,9 @@ public class AprSocketContext {
}
void unblock() {
- try {
+ try (java.net.Socket sock = new java.net.Socket()) {
// Easiest ( maybe safest ) way to interrupt accept
// we could have it in non-blocking mode, etc
- java.net.Socket sock = new java.net.Socket();
sock.connect(new InetSocketAddress("127.0.0.1", port));
} catch (Exception ex) {
// ignore - the acceptor may have shut down by itself.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1402671&r1=1402670&r2=1402671&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Fri Oct
26 21:33:31 2012
@@ -77,6 +77,7 @@ public class NioSelectorPool {
return SHARED_SELECTOR;
}
+ @SuppressWarnings("resource") // s is closed in put()
public Selector get() throws IOException{
if ( SHARED ) {
return getSharedSelector();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
