hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r690152 - /httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
Date Fri, 29 Aug 2008 08:42:40 GMT
Author: olegk
Date: Fri Aug 29 01:42:39 2008
New Revision: 690152

URL: http://svn.apache.org/viewvc?rev=690152&view=rev
Log:
HTTPCORE-171: SSL SocketHttpServerConnection close fails w/ UnsupportedOperationException


Modified:
    httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java

Modified: httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java?rev=690152&r1=690151&r2=690152&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
(original)
+++ httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
Fri Aug 29 01:42:39 2008
@@ -189,12 +189,16 @@
         this.open = false;
         doFlush();
         try {
-            this.socket.shutdownOutput();
-        } catch (IOException ignore) {
-        }
-        try {
-            this.socket.shutdownInput();
-        } catch (IOException ignore) {
+            try {
+                this.socket.shutdownOutput();
+            } catch (IOException ignore) {
+            }
+            try {
+                this.socket.shutdownInput();
+            } catch (IOException ignore) {
+            }
+        } catch (UnsupportedOperationException ignore) {
+            // if one isn't supported, the other one isn't either
         }
         this.socket.close();
     }



Mime
View raw message