Repository: nifi Updated Branches: refs/heads/master cb6752012 -> 887648c86
NIFI-1863 extended caught exception in cleaning task for HTTPContextMap Signed-off-by: Matt Burgess <mattyb...@apache.org> This closes #428 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/887648c8 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/887648c8 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/887648c8 Branch: refs/heads/master Commit: 887648c86f6dc52f6dd2d48b02a4993bdafb1bb7 Parents: cb67520 Author: Pierre Villard <pierre.villard...@gmail.com> Authored: Mon May 9 23:04:19 2016 +0200 Committer: Matt Burgess <mattyb...@apache.org> Committed: Tue May 10 13:46:40 2016 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/http/StandardHttpContextMap.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/887648c8/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/src/main/java/org/apache/nifi/http/StandardHttpContextMap.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/src/main/java/org/apache/nifi/http/StandardHttpContextMap.java b/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/src/main/java/org/apache/nifi/http/StandardHttpContextMap.java index bd3e866..9da357d 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/src/main/java/org/apache/nifi/http/StandardHttpContextMap.java +++ b/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/src/main/java/org/apache/nifi/http/StandardHttpContextMap.java @@ -16,7 +16,6 @@ */ package org.apache.nifi.http; -import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -177,8 +176,8 @@ public class StandardHttpContextMap extends AbstractControllerService implements final AsyncContext async = entry.getValue().getAsync(); ((HttpServletResponse) async.getResponse()).sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); async.complete(); - } catch (final IOException ioe) { - // we are trying to indicate that we are unavailable. If we have an IOException and cannot respond, + } catch (final Exception e) { + // we are trying to indicate that we are unavailable. If we have an exception and cannot respond, // then so be it. Nothing to really do here. } }
