TOMEE-1930 flag to skip host check in webapp builder
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/00378f29 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/00378f29 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/00378f29 Branch: refs/heads/master Commit: 00378f292ad6660470d6c15d6ef5df8dc5d00bdb Parents: 03aff62 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Tue Sep 13 15:47:02 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Tue Sep 13 15:47:02 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/00378f29/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java index e167ca4..1553219 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java @@ -267,6 +267,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare private ClassLoader parentClassLoader; private boolean initJEEInfo = true; private final ServletContextHandler servletContextHandler; + private boolean noHostCheck; /** * Creates a new web application builder @@ -340,6 +341,8 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare } catch (final Throwable th) { // no-op: can be another API impl, normally we are ok, this is really just a safe belt } + + noHostCheck = !Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.host.check", "true")); } private void setComponentsUsedByCDI() { @@ -2123,6 +2126,9 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare */ @Override public synchronized void checkHost(final StandardHost standardHost) { + if (noHostCheck) { + return; + } if (standardHost.getAutoDeploy()) { // Undeploy any modified application for (final Iterator<Map.Entry<String, DeployedApplication>> iterator = deployedApps.entrySet().iterator(); iterator.hasNext(); ) { @@ -2146,7 +2152,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare final File appBase = appBase(standardHost); final File[] files = appBase.listFiles(); if (null != files) { - for (final File file : files) { + for (File file : files) { if (file.getName().endsWith(".tmp")) { // tomcat is uploading, see org.apache.catalina.manager.ManagerServlet.deploy(java.io.PrintWriter, org.apache.catalina.util.ContextName, java.lang.String, boolean, javax.servlet.http.HttpServletRequest, org.apache.tomcat.util.res.StringManager) continue; }
