You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2008/09/06 13:59:47 UTC
svn commit: r692638 - in /httpcomponents/httpcore/trunk: RELEASE_NOTES.txt
module-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java
Author: olegk
Date: Sat Sep 6 04:59:47 2008
New Revision: 692638
URL: http://svn.apache.org/viewvc?rev=692638&view=rev
Log:
CancelledKeyException thrown in BaseIOReactor#validate() no longer causes a premature I/O reactor shutdown.
Modified:
httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java
Modified: httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt?rev=692638&r1=692637&r2=692638&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpcore/trunk/RELEASE_NOTES.txt Sat Sep 6 04:59:47 2008
@@ -1,6 +1,10 @@
Changes since 4.0 Beta 2
-------------------
+* CancelledKeyException thrown in BaseIOReactor#validate() no longer causes
+ a premature I/O reactor shutdown.
+ Contributed by Oleg Kalnichevski <olegk at apache.org>
+
* [HTTPCORE-172] Added #close() method to SharedInputBuffer and
SharedOutputBuffer. The purpose of the new method is to close the buffer
in case of normal / orderly termination of the underlying HTTP connection.
Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java?rev=692638&r1=692637&r2=692638&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java Sat Sep 6 04:59:47 2008
@@ -142,7 +142,16 @@
it.remove();
continue;
}
- int ops = session.getEventMask();
+
+ int ops = 0;
+ try {
+ ops = session.getEventMask();
+ } catch (CancelledKeyException ex) {
+ it.remove();
+ queueClosedSession(session);
+ continue;
+ }
+
if ((ops & EventMask.READ) > 0) {
try {
this.eventDispatch.inputReady(session);