diff options
Diffstat (limited to 'qpid/java/perftests/src')
3 files changed, 11 insertions, 8 deletions
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java index 10f62708a4..f34ac941bc 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java @@ -25,10 +25,11 @@ import java.util.concurrent.ThreadFactory; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.apache.qpid.disttest.message.ParticipantResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.qpid.disttest.message.ParticipantResult; + public class ParticipantExecutor { private static final Logger LOGGER = LoggerFactory.getLogger(ParticipantExecutor.class); @@ -100,7 +101,7 @@ public class ParticipantExecutor } result = _participant.doIt(_client.getClientName()); } - catch (Throwable t) + catch (Exception t) { String errorMessage = "Unhandled error: " + t.getMessage(); LOGGER.error(errorMessage, t); diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java index e973f07c12..a60a7ec88f 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java @@ -26,6 +26,9 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.disttest.DistributedTestException; import org.apache.qpid.disttest.controller.config.QueueConfig; import org.apache.qpid.disttest.controller.config.TestInstance; @@ -36,8 +39,6 @@ import org.apache.qpid.disttest.message.ParticipantResult; import org.apache.qpid.disttest.message.Response; import org.apache.qpid.disttest.message.StartTestCommand; import org.apache.qpid.disttest.message.TearDownTestCommand; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class TestRunner { @@ -72,7 +73,7 @@ public class TestRunner { deleteQueues(); } - catch (Throwable t) + catch (Exception t) { LOGGER.error("Failed to delete test queues during shutdown", t); } diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java index 782f7ae2fd..330407e375 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java @@ -36,13 +36,14 @@ import javax.jms.Session; import javax.naming.Context; import javax.naming.NamingException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.disttest.DistributedTestException; import org.apache.qpid.disttest.controller.CommandListener; import org.apache.qpid.disttest.controller.config.QueueConfig; import org.apache.qpid.disttest.message.Command; import org.apache.qpid.disttest.message.RegisterClientCommand; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ControllerJmsDelegate { @@ -121,7 +122,7 @@ public class ControllerJmsDelegate processCommandWithFirstSupportingListener(command); LOGGER.debug("Finished processing command for message " + jmsMessageID); } - catch (Throwable t) + catch (Exception t) { LOGGER.error("Can't handle JMS message", t); } |