Repository: tomee Updated Branches: refs/heads/master 2fe12fc53 -> 00378f292
TOMEE-1930 avoid to scan files tomcat is uploading Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/03aff626 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/03aff626 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/03aff626 Branch: refs/heads/master Commit: 03aff626b0e75d4f0398d99ed4a20e38364695db Parents: 2fe12fc Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Tue Sep 13 15:45:30 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Tue Sep 13 15:45:30 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/03aff626/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 5ed26c7..e167ca4 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 @@ -2146,7 +2146,11 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare final File appBase = appBase(standardHost); final File[] files = appBase.listFiles(); if (null != files) { - for (File file : files) { + for (final 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; + } + final String name = file.getName(); // ignore war files if (name.toLowerCase().endsWith(".war") || isRoot(name)
