You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2014/01/22 23:48:14 UTC
git commit: https://issues.apache.org/jira/browse/AMQ-4989
Updated Branches:
refs/heads/trunk dd0c9c414 -> d8cd37030
https://issues.apache.org/jira/browse/AMQ-4989
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/d8cd3703
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/d8cd3703
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/d8cd3703
Branch: refs/heads/trunk
Commit: d8cd37030ba51a14623abc4fbe168454b36c2970
Parents: dd0c9c4
Author: Timothy Bish <ta...@gmai.com>
Authored: Wed Jan 22 17:48:11 2014 -0500
Committer: Timothy Bish <ta...@gmai.com>
Committed: Wed Jan 22 17:48:11 2014 -0500
----------------------------------------------------------------------
.../activemq/transport/tcp/TcpTransportServer.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/d8cd3703/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
index 5e1426a..6eab645 100755
--- a/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
@@ -374,7 +374,16 @@ public class TcpTransportServer extends TransportServerThreadSupport implements
while (!isStopped() && !isStopping()) {
Socket sock = socketQueue.poll(1, TimeUnit.SECONDS);
if (sock != null) {
- handleSocket(sock);
+ try {
+ handleSocket(sock);
+ } catch (Throwable thrown) {
+ if (!isStopping()) {
+ onAcceptError(new Exception(thrown));
+ } else if (!isStopped()) {
+ LOG.warn("Unexpected error thrown during accept handling: ", thrown);
+ onAcceptError(new Exception(thrown));
+ }
+ }
}
}
@@ -519,6 +528,7 @@ public class TcpTransportServer extends TransportServerThreadSupport implements
return allowLinkStealing;
}
+ @Override
public void setAllowLinkStealing(boolean allowLinkStealing) {
this.allowLinkStealing = allowLinkStealing;
}