You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2016/07/09 00:24:45 UTC
[01/10] cassandra git commit: ninja fix condition to ensure close in
ConnectionHandler
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 f28409bb9 -> e983590d3
refs/heads/cassandra-3.0 a227cc61c -> 2fa44cd88
refs/heads/cassandra-3.9 c1dcc9ce4 -> 1417a516c
refs/heads/trunk cb9865c94 -> 09720f81d
ninja fix condition to ensure close in ConnectionHandler
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e983590d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e983590d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e983590d
Branch: refs/heads/cassandra-2.2
Commit: e983590d303c9c19577b3bd5b5c95adc9f5abb8a
Parents: f28409b
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Jul 8 19:05:06 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Jul 8 19:05:06 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e983590d/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 364435e..d3d8ed2 100644
--- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
+++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
@@ -233,7 +233,7 @@ public class ConnectionHandler
protected void signalCloseDone()
{
- if (closeFuture == null)
+ if (!isClosed())
close();
closeFuture.get().set(null);
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fa44cd8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fa44cd8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fa44cd8
Branch: refs/heads/cassandra-3.0
Commit: 2fa44cd88119c24489836e0c0c91fd3eed86ce3c
Parents: a227cc6 e983590
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Jul 8 19:05:46 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Jul 8 19:05:46 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fa44cd8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fa44cd8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fa44cd8
Branch: refs/heads/cassandra-3.9
Commit: 2fa44cd88119c24489836e0c0c91fd3eed86ce3c
Parents: a227cc6 e983590
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Jul 8 19:05:46 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Jul 8 19:05:46 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[02/10] cassandra git commit: ninja fix condition to ensure close in
ConnectionHandler
Posted by yu...@apache.org.
ninja fix condition to ensure close in ConnectionHandler
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e983590d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e983590d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e983590d
Branch: refs/heads/cassandra-3.0
Commit: e983590d303c9c19577b3bd5b5c95adc9f5abb8a
Parents: f28409b
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Jul 8 19:05:06 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Jul 8 19:05:06 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e983590d/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 364435e..d3d8ed2 100644
--- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
+++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
@@ -233,7 +233,7 @@ public class ConnectionHandler
protected void signalCloseDone()
{
- if (closeFuture == null)
+ if (!isClosed())
close();
closeFuture.get().set(null);
[03/10] cassandra git commit: ninja fix condition to ensure close in
ConnectionHandler
Posted by yu...@apache.org.
ninja fix condition to ensure close in ConnectionHandler
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e983590d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e983590d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e983590d
Branch: refs/heads/cassandra-3.9
Commit: e983590d303c9c19577b3bd5b5c95adc9f5abb8a
Parents: f28409b
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Jul 8 19:05:06 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Jul 8 19:05:06 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e983590d/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 364435e..d3d8ed2 100644
--- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
+++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
@@ -233,7 +233,7 @@ public class ConnectionHandler
protected void signalCloseDone()
{
- if (closeFuture == null)
+ if (!isClosed())
close();
closeFuture.get().set(null);
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fa44cd8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fa44cd8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fa44cd8
Branch: refs/heads/trunk
Commit: 2fa44cd88119c24489836e0c0c91fd3eed86ce3c
Parents: a227cc6 e983590
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Jul 8 19:05:46 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Jul 8 19:05:46 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1417a516
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1417a516
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1417a516
Branch: refs/heads/cassandra-3.9
Commit: 1417a516cf7cc89dc456eb8c9c7e2759811a6991
Parents: c1dcc9c 2fa44cd
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Jul 8 19:12:34 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Jul 8 19:12:34 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1417a516/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
----------------------------------------------------------------------
[04/10] cassandra git commit: ninja fix condition to ensure close in
ConnectionHandler
Posted by yu...@apache.org.
ninja fix condition to ensure close in ConnectionHandler
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e983590d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e983590d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e983590d
Branch: refs/heads/trunk
Commit: e983590d303c9c19577b3bd5b5c95adc9f5abb8a
Parents: f28409b
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Jul 8 19:05:06 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Jul 8 19:05:06 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e983590d/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 364435e..d3d8ed2 100644
--- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
+++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
@@ -233,7 +233,7 @@ public class ConnectionHandler
protected void signalCloseDone()
{
- if (closeFuture == null)
+ if (!isClosed())
close();
closeFuture.get().set(null);
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1417a516
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1417a516
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1417a516
Branch: refs/heads/trunk
Commit: 1417a516cf7cc89dc456eb8c9c7e2759811a6991
Parents: c1dcc9c 2fa44cd
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Jul 8 19:12:34 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Jul 8 19:12:34 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1417a516/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
----------------------------------------------------------------------
[10/10] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09720f81
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09720f81
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09720f81
Branch: refs/heads/trunk
Commit: 09720f81d9185a3e4c355f9cfb7db439561b1e3c
Parents: cb9865c 1417a51
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Jul 8 19:24:08 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Jul 8 19:24:08 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------