Repository: nifi Updated Branches: refs/heads/master 7123a1a27 -> dca3764ed
NIFI-2626 Fixes jetty server thread leak. This closes #910 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/dca3764e Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/dca3764e Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/dca3764e Branch: refs/heads/master Commit: dca3764ed11789da6e5a44f8940c6e23da713128 Parents: 7123a1a Author: Jeff Storck <[email protected]> Authored: Mon Aug 22 14:48:06 2016 -0400 Committer: Matt Gilman <[email protected]> Committed: Mon Aug 22 15:58:06 2016 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/processors/standard/ListenHTTP.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/dca3764e/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java index 5ea116e7..3e8576d 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java @@ -182,6 +182,10 @@ public class ListenHTTP extends AbstractSessionFactoryProcessor { return; } + shutdownHttpServer(toShutdown); + } + + private void shutdownHttpServer(Server toShutdown) { try { toShutdown.stop(); toShutdown.destroy(); @@ -276,7 +280,12 @@ public class ListenHTTP extends AbstractSessionFactoryProcessor { if (context.getProperty(HEADERS_AS_ATTRIBUTES_REGEX).isSet()) { contextHandler.setAttribute(CONTEXT_ATTRIBUTE_HEADER_PATTERN, Pattern.compile(context.getProperty(HEADERS_AS_ATTRIBUTES_REGEX).getValue())); } - server.start(); + try { + server.start(); + } catch (Exception e) { + shutdownHttpServer(server); + throw e; + } this.server = server; }
