You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2015/05/19 10:33:18 UTC
[1/2] cassandra git commit: Log error when closing streaming
connection at debug
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 aa133b70f -> 816c2b3f7
Log error when closing streaming connection at debug
(this is good hygiene and remove a findBugs warning in particular)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59b8e171
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59b8e171
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59b8e171
Branch: refs/heads/cassandra-2.2
Commit: 59b8e171e91e4d714acac5ec195f40158e2e2971
Parents: 7acd0e6
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue May 19 10:31:48 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue May 19 10:31:52 2015 +0200
----------------------------------------------------------------------
.../org/apache/cassandra/streaming/ConnectionHandler.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59b8e171/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
index 6092046..aa3504a 100644
--- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
+++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
@@ -215,7 +215,12 @@ public class ConnectionHandler
{
socket.close();
}
- catch (IOException ignore) {}
+ catch (IOException e)
+ {
+ // Erroring out while closing shouldn't happen but is not really a big deal, so just log
+ // it at DEBUG and ignore otherwise.
+ logger.debug("Unexpected error while closing streaming connection", e);
+ }
}
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/816c2b3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/816c2b3f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/816c2b3f
Branch: refs/heads/cassandra-2.2
Commit: 816c2b3f777843279295e67b0906f3df92ccc84a
Parents: aa133b7 59b8e17
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue May 19 10:33:06 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue May 19 10:33:06 2015 +0200
----------------------------------------------------------------------
.../org/apache/cassandra/streaming/ConnectionHandler.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/816c2b3f/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
----------------------------------------------------------------------