Updated Branches: refs/heads/cassandra-1.2 9793d6f32 -> dc5b1e9b8
Set isRunning flag later in binary protocol server patch by slebresne; reviewed by krummas for CASSANDRA-5467 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc5b1e9b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc5b1e9b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc5b1e9b Branch: refs/heads/cassandra-1.2 Commit: dc5b1e9b86b42c786b4e1e3752a08d45e6e447e8 Parents: 9793d6f Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Apr 26 17:17:53 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Apr 26 17:17:53 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/transport/Server.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc5b1e9b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d1b59bb..7634742 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,7 @@ * Fix primary range ignores replication strategy (CASSANDRA-5424) * Fix shutdown of binary protocol server (CASSANDRA-5507) * Fix repair -snapshot not working (CASSANDRA-5512) + * Set isRunning flag later in binary protocol server (CASSANDRA-5467) Merged from 1.1 * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393) * Use allocator information to improve memtable memory usage estimate http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc5b1e9b/src/java/org/apache/cassandra/transport/Server.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/Server.java b/src/java/org/apache/cassandra/transport/Server.java index 74394d2..51a90e8 100644 --- a/src/java/org/apache/cassandra/transport/Server.java +++ b/src/java/org/apache/cassandra/transport/Server.java @@ -95,8 +95,8 @@ public class Server implements CassandraDaemon.Server public void start() { - if (isRunning.compareAndSet(false, true)) - run(); + run(); + isRunning.set(true); } public void stop() @@ -110,7 +110,7 @@ public class Server implements CassandraDaemon.Server return isRunning.get(); } - public void run() + private void run() { // Configure the server. executionHandler = new ExecutionHandler(new RequestThreadPoolExecutor()); @@ -137,7 +137,7 @@ public class Server implements CassandraDaemon.Server connectionTracker.allChannels.add(channel); } - public void close() + private void close() { // Close opened connections connectionTracker.closeAll();
