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/01/18 01:23:51 UTC

svn commit: r613020 - in /httpcomponents/httpcore/trunk: RELEASE_NOTES.txt module-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java

Author: olegk
Date: Thu Jan 17 16:23:50 2008
New Revision: 613020

URL: http://svn.apache.org/viewvc?rev=613020&view=rev
Log:
HTTPCORE-141: Session request timeout in DefaultConnectingIOReactor invalidates the request.


Modified:
    httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java

Modified: httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt?rev=613020&r1=613019&r2=613020&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpcore/trunk/RELEASE_NOTES.txt Thu Jan 17 16:23:50 2008
@@ -17,6 +17,10 @@
 Changelog:
 ----------
 
+* [HTTPCORE-141] Session request timeout in DefaultConnectingIOReactor
+  invalidates the request.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
 * [HTTPCORE-137] DefaultHttpRequestFactory extended to support all methods 
   specified in RFC 2616 (except CONNECT).
   Contributed by Oleg Kalnichevski <olegk at apache.org>

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java?rev=613020&r1=613019&r2=613020&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java (original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java Thu Jan 17 16:23:50 2008
@@ -146,6 +146,10 @@
         if (this.completed) {
             return;
         }
+        this.completed = true;
+        if (this.key != null) {
+            this.key.cancel();
+        }
         synchronized (this) {
             if (this.callback != null) {
                 this.callback.timeout(this);