Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 569CA1020F for ; Mon, 16 Feb 2015 15:24:18 +0000 (UTC) Received: (qmail 15953 invoked by uid 500); 16 Feb 2015 15:24:08 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 15911 invoked by uid 500); 16 Feb 2015 15:24:08 -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 15902 invoked by uid 99); 16 Feb 2015 15:24:08 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Feb 2015 15:24:08 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id B72D0AC00A8 for ; Mon, 16 Feb 2015 15:24:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1660138 - /httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java Date: Mon, 16 Feb 2015 15:24:08 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150216152408.B72D0AC00A8@hades.apache.org> Author: olegk Date: Mon Feb 16 15:24:08 2015 New Revision: 1660138 URL: http://svn.apache.org/r1660138 Log: Supress IOException thrown by Socket#setSoLinger in BHttpConnectionBase#shutdown method Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java?rev=1660138&r1=1660137&r2=1660138&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java Mon Feb 16 15:24:08 2015 @@ -216,8 +216,12 @@ class BHttpConnectionBase implements BHt final Socket socket = this.socketHolder.getAndSet(null); if (socket != null) { // force abortive close (RST) - socket.setSoLinger(true, 0); - socket.close(); + try { + socket.setSoLinger(true, 0); + } catch (IOException ex) { + } finally { + socket.close(); + } } }