You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2020/01/19 16:10:12 UTC
[nifi] branch master updated: NIFI-6997 This closes #3971.
connection closing fixed
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new ab01136 NIFI-6997 This closes #3971. connection closing fixed
ab01136 is described below
commit ab0113664d5e6b96ffcbc70feaea73d3b71eb51a
Author: Dirk Ernst van den Biggelaar <di...@ultratendency.com>
AuthorDate: Thu Jan 9 14:57:24 2020 +0100
NIFI-6997 This closes #3971. connection closing fixed
Signed-off-by: Joe Witt <jo...@apache.org>
---
.../src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java
index 55a53c7..3af4ee9 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java
+++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java
@@ -194,6 +194,13 @@ public class ConsumeAMQP extends AbstractAMQPProcessor<AMQPConsumer> {
return amqpConsumer;
} catch (final IOException ioe) {
+ try {
+ connection.close();
+ getLogger().warn("Closed connection at port " + connection.getPort());
+ } catch (final IOException ioeClose) {
+ throw new ProcessException("Failed to close connection at port " + connection.getPort());
+ }
+
throw new ProcessException("Failed to connect to AMQP Broker", ioe);
}
}