summaryrefslogtreecommitdiff
path: root/qpid/java/systests/src
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2015-03-16 16:52:32 +0000
committerKeith Wall <kwall@apache.org>2015-03-16 16:52:32 +0000
commit67a2cb9fe4149dc9d6cd750b3426995033ea9d9d (patch)
tree20633ed3c757a764123d5c98811462afe72cb9b2 /qpid/java/systests/src
parente756d0579c8e0f4373e56a4d608acf9eb5632f57 (diff)
downloadqpid-python-67a2cb9fe4149dc9d6cd750b3426995033ea9d9d.tar.gz
QPID-6429, QPID-6262: [Java Broker] Improve error handling in new NIO code; Remove MINA terminlogy (session etc) in 0-8 stack
* Also added uncaught exception handler in test framework (QBTC) to guard log the case where a thread exits abnormally. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1667068 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src')
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
index 4965f54403..3c3276c87a 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
@@ -49,6 +49,21 @@ public class InternalBrokerHolder implements BrokerHolder
@Override
public void start(BrokerOptions options) throws Exception
{
+ if (Thread.getDefaultUncaughtExceptionHandler() != null)
+ {
+ Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
+ {
+ @Override
+ public void uncaughtException(final Thread t, final Throwable e)
+ {
+ System.err.print("Thread terminated due to uncaught exception");
+ e.printStackTrace();
+
+ LOGGER.error("Uncaught exception from thread " + t.getName(), e);
+ }
+ });
+ }
+
LOGGER.info("Starting internal broker (same JVM)");
_broker = new Broker(new Action<Integer>()