NIFI-3531 Catch and rethrow generic Exception to handle RuntimeExceptions, and allow test to pass This closes #2931. Signed-off-by: Brandon Devries <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/76a9f98d Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/76a9f98d Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/76a9f98d Branch: refs/heads/master Commit: 76a9f98d7f43b0b23c7360a2d21ee81f5d19309e Parents: 8309747 Author: Mike Moser <[email protected]> Authored: Wed Sep 5 15:49:44 2018 -0400 Committer: Brandon Devries <[email protected]> Committed: Tue Oct 2 11:06:51 2018 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/jms/processors/JMSConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/76a9f98d/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSConsumer.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSConsumer.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSConsumer.java index cf22175..a2c73b4 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSConsumer.java +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSConsumer.java @@ -122,7 +122,7 @@ final class JMSConsumer extends JMSWorker { // and if CLIENT_ACKNOWLEDGE is set. consumerCallback.accept(response); acknowledge(message, session); - } catch (JMSException e) { + } catch (Exception e) { // We need to call recover to ensure that in the event of // abrupt end or exception the current session will stop message // delivery and restart with the oldest unacknowledged message
