You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/03/20 17:40:10 UTC
[2/3] git commit: Catch harmless error on shutdown. Patch by
brandonwilliams, reviewed by jbellis for CASSANDRA-5368
Catch harmless error on shutdown.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-5368
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87d93625
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87d93625
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87d93625
Branch: refs/heads/trunk
Commit: 87d936251df056211673b90d62f37b9fe3440d83
Parents: f3a93f9
Author: Brandon Williams <br...@apache.org>
Authored: Wed Mar 20 11:38:45 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Mar 20 11:38:45 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/net/MessagingService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/87d93625/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 98495be..e1331c2 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -25,6 +25,7 @@ import java.lang.management.ManagementFactory;
import java.net.*;
import java.nio.ByteBuffer;
import java.nio.channels.AsynchronousCloseException;
+import java.nio.channels.ClosedChannelException;
import java.nio.channels.ServerSocketChannel;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
@@ -888,6 +889,11 @@ public final class MessagingService implements MessagingServiceMBean
logger.info("MessagingService shutting down server thread.");
break;
}
+ catch (ClosedChannelException e)
+ {
+ logger.debug("MessagingService server thread already closed.");
+ break;
+ }
catch (IOException e)
{
throw new RuntimeException(e);