Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 86238 invoked from network); 22 Sep 2010 01:49:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Sep 2010 01:49:37 -0000 Received: (qmail 53068 invoked by uid 500); 22 Sep 2010 01:49:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 53046 invoked by uid 500); 22 Sep 2010 01:49:37 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 53038 invoked by uid 99); 22 Sep 2010 01:49:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Sep 2010 01:49:37 +0000 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; Wed, 22 Sep 2010 01:49:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 94385238890A; Wed, 22 Sep 2010 01:49:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r999720 - /cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java Date: Wed, 22 Sep 2010 01:49:13 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100922014913.94385238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Wed Sep 22 01:49:13 2010 New Revision: 999720 URL: http://svn.apache.org/viewvc?rev=999720&view=rev Log: r/m redundant code post-merge. patch by jbellis Modified: cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java Modified: cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java?rev=999720&r1=999719&r2=999720&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java Wed Sep 22 01:49:13 2010 @@ -88,30 +88,12 @@ public class IncomingTcpConnection exten { if (logger.isTraceEnabled()) logger.trace("eof reading from socket; closing", e); - try - { - socket.close(); - } - catch (IOException e2) - { - if (logger.isDebugEnabled()) - logger.debug("error closing socket", e2); - } break; } catch (IOException e) { if (logger.isDebugEnabled()) logger.debug("error reading from socket; closing", e); - try - { - socket.close(); - } - catch (IOException e2) - { - if (logger.isDebugEnabled()) - logger.debug("error closing socket", e2); - } break; } }