loop based on isClosed to accomodate SSL sockets patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6349
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53af91e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53af91e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53af91e6 Branch: refs/heads/trunk Commit: 53af91e650d3fd881df6e811f5d4c5e46a039119 Parents: 1d60528 Author: Jonathan Ellis <[email protected]> Authored: Tue Dec 17 16:37:43 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Tue Dec 17 16:38:32 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/MessagingService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/53af91e6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c2cd052..b8757d7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.4 + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468) * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496) * Fix assertion failure in filterColdSSTables (CASSANDRA-6483) * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008) http://git-wip-us.apache.org/repos/asf/cassandra/blob/53af91e6/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index b2c8014..21c9345 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -827,7 +827,7 @@ public final class MessagingService implements MessagingServiceMBean public void run() { - while (true) + while (!server.isClosed()) { Socket socket = null; try
