Updated Branches: refs/heads/cassandra-1.2 83b75754f -> f8c072e97 refs/heads/trunk 4cd087f44 -> a90e8b77c
make starting native protocol server idempotent patch by Manoj Mainali; reviewed by jbellis for CASSANDRA-5728 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8c072e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8c072e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8c072e9 Branch: refs/heads/cassandra-1.2 Commit: f8c072e974eef21ca7287e21db33f09788cb56c0 Parents: 83b7575 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Jul 8 11:30:31 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Jul 8 11:30:31 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/transport/Server.java | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8c072e9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b08f967..7c16cd0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.2.7 + * make starting native protocol server idempotent (CASSANDRA-5728) * Fix loading key cache when a saved entry is no longer valid (CASSANDRA-5706) * Fix serialization of the LEFT gossip value (CASSANDRA-5696) * Pig: support for cql3 tables (CASSANDRA-5234) @@ -9,6 +10,7 @@ * Expire entries out of ThriftSessionManager (CASSANRDA-5719) * Don't keep ancestor information in memory (CASSANDRA-5342) + 1.2.6 * Fix tracing when operation completes before all responses arrive (CASSANDRA-5668) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8c072e9/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 51a90e8..7400a8b 100644 --- a/src/java/org/apache/cassandra/transport/Server.java +++ b/src/java/org/apache/cassandra/transport/Server.java @@ -95,8 +95,11 @@ public class Server implements CassandraDaemon.Server public void start() { - run(); - isRunning.set(true); + if(!isRunning()) + { + run(); + isRunning.set(true); + } } public void stop()
