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 2005/06/09 21:44:40 UTC
svn commit: r189801 -
/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java
Author: olegk
Date: Thu Jun 9 12:44:38 2005
New Revision: 189801
URL: http://svn.apache.org/viewcvs?rev=189801&view=rev
Log:
Perform additional checks on the state of the underlying socket when closing connection
Modified:
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java
Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java?rev=189801&r1=189800&r2=189801&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java Thu Jun 9 12:44:38 2005
@@ -138,9 +138,15 @@
this.datatransmitter = null;
Socket tmpsocket = this.socket;
if (tmpsocket != null) {
- tmpsocket.shutdownOutput();
- tmpsocket.shutdownInput();
- tmpsocket.close();
+ if (!tmpsocket.isClosed()) {
+ if (!tmpsocket.isOutputShutdown()) {
+ tmpsocket.shutdownOutput();
+ }
+ if (!tmpsocket.isInputShutdown()) {
+ tmpsocket.shutdownInput();
+ }
+ tmpsocket.close();
+ }
}
this.socket = null;
}