You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2018/07/18 09:28:02 UTC
nifi git commit: NIFI-5196 Fixed JMS connection leak when uncaught
exceptions happen
Repository: nifi
Updated Branches:
refs/heads/master 461eca0d1 -> 4e09a03f8
NIFI-5196 Fixed JMS connection leak when uncaught exceptions happen
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #2904.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4e09a03f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4e09a03f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4e09a03f
Branch: refs/heads/master
Commit: 4e09a03f86b50a8b5b26d00542aabbd48bbc4b9d
Parents: 461eca0
Author: Mike Moser <mo...@apache.org>
Authored: Tue Jul 17 21:20:47 2018 +0000
Committer: Pierre Villard <pi...@gmail.com>
Committed: Wed Jul 18 11:27:51 2018 +0200
----------------------------------------------------------------------
.../org/apache/nifi/jms/processors/AbstractJMSProcessor.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/4e09a03f/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
index 26a1f62..a4cf6d4 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
@@ -155,8 +155,11 @@ abstract class AbstractJMSProcessor<T extends JMSWorker> extends AbstractProcess
worker = buildTargetResource(context);
}
- rendezvousWithJms(context, session, worker);
- workerPool.offer(worker);
+ try {
+ rendezvousWithJms(context, session, worker);
+ } finally {
+ workerPool.offer(worker);
+ }
}
@OnScheduled