cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [02/10] cassandra git commit: Synchronize ThriftServer::stop()
Date Mon, 11 Jul 2016 14:02:00 GMT
Synchronize ThriftServer::stop()

patch by Brian Wawok; reviewed by Aleksey Yeschenko for CASSANDRA-12105


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a8406f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a8406f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a8406f2

Branch: refs/heads/cassandra-3.0
Commit: 9a8406f2f7f03fb1794e6cb0b5585579cb93cc92
Parents: e983590
Author: Brian Wawok <brian.wawok@datasax.com>
Authored: Mon Jul 11 14:52:20 2016 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Jul 11 14:53:24 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                            | 1 +
 src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a8406f2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9fef5a2..837c3fb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.8
+ * Synchronize ThriftServer::stop() (CASSANDRA-12105)
  * Use dedicated thread for JMX notifications (CASSANDRA-12146)
  * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a8406f2/src/java/org/apache/cassandra/thrift/ThriftServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/ThriftServer.java b/src/java/org/apache/cassandra/thrift/ThriftServer.java
index 2409606..44ec524 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftServer.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftServer.java
@@ -60,7 +60,7 @@ public class ThriftServer implements CassandraDaemon.Server
         }
     }
 
-    public void stop()
+    public synchronized void stop()
     {
         if (server != null)
         {


Mime
View raw message