Repository: nifi Updated Branches: refs/heads/master a3ddb3b4f -> e3c661daa
NIFI-4761 Fixing test case regression. This closes #2418. Signed-off-by: Andy LoPresto <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e3c661da Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e3c661da Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e3c661da Branch: refs/heads/master Commit: e3c661daac69cdb2de43c3d66d9ed1ccc9c8dbc6 Parents: a3ddb3b Author: Matt Gilman <[email protected]> Authored: Fri Jan 19 12:42:47 2018 -0500 Committer: Andy LoPresto <[email protected]> Committed: Fri Jan 19 09:47:31 2018 -0800 ---------------------------------------------------------------------- .../apache/nifi/web/server/HostHeaderHandler.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e3c661da/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java index 9a07fcb..72e8d84 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java @@ -70,15 +70,20 @@ public class HostHeaderHandler extends ScopedHandler { this.serverName = Objects.requireNonNull(serverName); this.serverPort = serverPort; - // Default values across generic instances validHosts = generateDefaultHostnames(null); - - // specified host:port validHosts.add(serverName.toLowerCase()); validHosts.add(serverName.toLowerCase() + ":" + serverPort); - - // empty is ok here + // Sometimes the hostname is left empty but the port is always populated + validHosts.add("localhost"); + validHosts.add("localhost:" + serverPort); + // Different from customizer -- empty is ok here validHosts.add(""); + try { + validHosts.add(InetAddress.getLocalHost().getHostName().toLowerCase()); + validHosts.add(InetAddress.getLocalHost().getHostName().toLowerCase() + ":" + serverPort); + } catch (final Exception e) { + logger.warn("Failed to determine local hostname.", e); + } logger.info("Created " + this.toString()); }
