Author: markt
Date: Thu Oct 9 05:37:06 2008
New Revision: 703154
URL: http://svn.apache.org/viewvc?rev=703154&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45618
Make sure selector is closed. Unlikely to be an issue for most (all?)
circumstances but technically needs fixing.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 9 05:37:06 2008
@@ -1 +1 @@
-/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691805,692748,695053,695311,698012,698227,698236,698613
+/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,698012,698227,698236,698613
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=703154&r1=703153&r2=703154&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 9 05:37:06 2008
@@ -88,14 +88,6 @@
+1: markt, remm
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45618
- Make sure selector is closed.
- Unlikely to be an issue for most (all?) circumstances but technically
- needs fixing,
- http://svn.apache.org/viewvc?rev=691392&view=rev
- +1: markt, rjung, fhanik
- -1:
-
* ETag improvement: https://issues.apache.org/bugzilla/show_bug.cgi?id=45735
+1: remm, markt, rjung
-1:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=703154&r1=703153&r2=703154&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
Thu Oct 9 05:37:06 2008
@@ -275,6 +275,7 @@
public void finalize() {
try {disconnect(); }catch ( Exception ignore){}
+ try {selector.close();} catch (Exception ignore) {}
}
public boolean keepalive() {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=703154&r1=703153&r2=703154&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Oct 9 05:37:06 2008
@@ -146,6 +146,10 @@
<add>
Document the multicast recovery options. (fhanik)
</add>
+ <fix>
+ <bug>45618</bug>: Make sure NIO selector is closed when no longer used.
+ Unlikely to be an issue in normal usage. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
