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 2007/01/24 10:30:36 UTC
svn commit: r499328 - in /jakarta/httpcomponents/httpcore/trunk:
RELEASE_NOTES.txt
module-nio/src/main/java/org/apache/http/nio/impl/reactor/DefaultConnectingIOReactor.java
Author: olegk
Date: Wed Jan 24 01:30:35 2007
New Revision: 499328
URL: http://svn.apache.org/viewvc?view=rev&rev=499328
Log:
[HTTPCORE-29]: DefaultConnectingIOReactor changed to ensure IOExceptions are correctly propagated to the caller, if an exception is thrown while initializing a newly connected socket
Modified:
jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/DefaultConnectingIOReactor.java
Modified: jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt?view=diff&rev=499328&r1=499327&r2=499328
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt (original)
+++ jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt Wed Jan 24 01:30:35 2007
@@ -1,12 +1,16 @@
Changes since release 4.0 Alpha 3
-------------------
+* [HTTPCORE-29] DefaultConnectingIOReactor changed to ensure IOExceptions
+ are correctly propagated to the caller, if an exception is thrown while
+ initializing a newly connected socket.
+ Contributed by Oleg Kalnichevski <olegk at apache.org>
+
* [HTTPCORE-24] Fixed bug in non-blocking connection implementations, which
prevented the session buffer from being correctly flushed when the content
coding process has been completed.
Contributed by Oleg Kalnichevski <olegk at apache.org>
-Contributed by Asankha C. Perera <asankha at wso2.com> and Oleg Kalnichevski
* [HTTPCORE-23] Fixed threading bug in DefaultConnectingIOReactor.
Contributed by Asankha C. Perera <asankha at wso2.com>
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/DefaultConnectingIOReactor.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/DefaultConnectingIOReactor.java?view=diff&rev=499328&r1=499327&r2=499328
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/DefaultConnectingIOReactor.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/DefaultConnectingIOReactor.java Wed Jan 24 01:30:35 2007
@@ -124,10 +124,14 @@
}
key.cancel();
if (channel.isConnected()) {
- prepareSocket(channel.socket());
- Object attachment = sessionRequest.getAttachment();
- ChannelEntry entry = new ChannelEntry(channel, attachment);
- addChannel(entry);
+ try {
+ prepareSocket(channel.socket());
+ Object attachment = sessionRequest.getAttachment();
+ ChannelEntry entry = new ChannelEntry(channel, attachment);
+ addChannel(entry);
+ } catch (IOException ex) {
+ sessionRequest.failed(ex);
+ }
}
}