You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/01/05 05:05:27 UTC
svn commit: r895885 - in
/incubator/cassandra/trunk/src/java/org/apache/cassandra/net:
MessagingService.java TcpConnection.java TcpConnectionManager.java
Author: jbellis
Date: Tue Jan 5 04:05:26 2010
New Revision: 895885
URL: http://svn.apache.org/viewvc?rev=895885&view=rev
Log:
r/m unused TC.inUse_ field
patch by jbellis; reviewed by gdusbabek for CASSANDRA-659
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnectionManager.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java?rev=895885&r1=895884&r2=895885&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java Tue Jan 5 04:05:26 2010
@@ -427,13 +427,6 @@
}
logger_.error("unexpected error writing " + message, e);
}
- finally
- {
- if (connection != null)
- {
- connection.close();
- }
- }
}
public IAsyncResult sendRR(Message message, InetAddress to)
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java?rev=895885&r1=895884&r2=895885&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java Tue Jan 5 04:05:26 2010
@@ -55,8 +55,7 @@
private Queue<ByteBuffer> pendingWrites_ = new ConcurrentLinkedQueue<ByteBuffer>();
private InetAddress localEp_;
private InetAddress remoteEp_;
- boolean inUse_ = false;
-
+
/*
* Added for streaming support. We need the boolean
* to indicate that this connection is used for
@@ -272,11 +271,6 @@
}
}
- public void close()
- {
- inUse_ = false;
- }
-
public boolean isConnected()
{
return socketChannel_.isConnected();
@@ -304,7 +298,7 @@
void closeSocket()
{
if (pendingWrites_.size() > 0)
- logger_.error("Closing down connection " + socketChannel_ + " with " + pendingWrites_.size() + " writes remaining.");
+ logger_.warn("Closing down connection " + socketChannel_ + " with " + pendingWrites_.size() + " writes remaining.");
cancel(key_);
pendingWrites_.clear();
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnectionManager.java?rev=895885&r1=895884&r2=895885&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnectionManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnectionManager.java Tue Jan 5 04:05:26 2010
@@ -41,7 +41,6 @@
private TcpConnection newCon() throws IOException
{
TcpConnection con = new TcpConnection(this, localEp_, remoteEp_);
- con.inUse_ = true;
return con;
}