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;
}
}