Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 49385 invoked from network); 29 Aug 2008 08:43:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Aug 2008 08:43:32 -0000 Received: (qmail 90114 invoked by uid 500); 29 Aug 2008 08:43:30 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 90091 invoked by uid 500); 29 Aug 2008 08:43:30 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 90076 invoked by uid 99); 29 Aug 2008 08:43:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Aug 2008 01:43:30 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Aug 2008 08:42:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C8502238899F; Fri, 29 Aug 2008 01:42:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080829084240.C8502238899F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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(); }