You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/10/17 04:01:50 UTC
svn commit: r585325 - in /mina:
branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/
branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/
trunk/core/src/main/java/org/apache/mina/transport/socket/nio/
Author: trustin
Date: Tue Oct 16 19:01:48 2007
New Revision: 585325
URL: http://svn.apache.org/viewvc?rev=585325&view=rev
Log:
Fixed possible FD leak in SocketConnector (I think it won't happen at most cases though...)
Modified:
mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
mina/branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
Modified: mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?rev=585325&r1=585324&r2=585325&view=diff
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java Tue Oct 16 19:01:48 2007
@@ -269,6 +269,11 @@
ch.register(selector, SelectionKey.OP_CONNECT, req);
} catch (IOException e) {
req.setException(e);
+ try {
+ ch.close();
+ } catch (IOException e2) {
+ ExceptionMonitor.getInstance().exceptionCaught(e2);
+ }
}
}
}
Modified: mina/branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?rev=585325&r1=585324&r2=585325&view=diff
==============================================================================
--- mina/branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original)
+++ mina/branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java Tue Oct 16 19:01:48 2007
@@ -254,6 +254,11 @@
ch.register(selector, SelectionKey.OP_CONNECT, req);
} catch (IOException e) {
req.setException(e);
+ try {
+ ch.close();
+ } catch (IOException e2) {
+ ExceptionMonitor.getInstance().exceptionCaught(e2);
+ }
}
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java?rev=585325&r1=585324&r2=585325&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java Tue Oct 16 19:01:48 2007
@@ -219,6 +219,11 @@
ch.register(selector, SelectionKey.OP_CONNECT, req);
} catch (IOException e) {
req.setException(e);
+ try {
+ ch.close();
+ } catch (IOException e2) {
+ ExceptionMonitor.getInstance().exceptionCaught(e2);
+ }
}
}
}