cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [2/6] git commit: Don't try to shutdown client servers if they don't exist.
Date Sat, 13 Sep 2014 19:45:09 GMT
Don't try to shutdown client servers if they don't exist.

Patch by Steve Nelson, reviewed by brandonwilliams for CASSANDRA-7889


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

Branch: refs/heads/cassandra-2.1
Commit: 169ec3db8c78dbce103721c48827ee5e32490ff9
Parents: cb14792
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Sat Sep 13 14:43:33 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Sat Sep 13 14:43:33 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/169ec3db/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 12d6420..7f92034 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -565,7 +565,8 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
                 if (mutationStage.isShutdown())
                     return; // drained already
 
-                shutdownClientServers();
+                if (daemon != null)
+                	shutdownClientServers();
                 optionalTasks.shutdown();
                 Gossiper.instance.stop();
 


Mime
View raw message