TOMEE-2145 fix compile error
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4b11c31b Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4b11c31b Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4b11c31b Branch: refs/heads/tomee-1.7.x Commit: 4b11c31b714e8093ae18d5638a5c0b07cb2e7097 Parents: a3150bb Author: Jonathan Gallimore <j...@jrg.me.uk> Authored: Wed Nov 1 17:24:39 2017 +0000 Committer: Jonathan Gallimore <j...@jrg.me.uk> Committed: Wed Nov 1 17:24:39 2017 +0000 ---------------------------------------------------------------------- .../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/4b11c31b/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 0ba0c30..647cc5b 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 @@ -1429,13 +1429,13 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare private static boolean shouldNotDeploy(StandardContext standardContext) { if (StandardHost.class.isInstance(standardContext.getParent())) { final StandardHost host = StandardHost.class.cast(standardContext.getParent()); - if (host.getAutoDeploy() && new File(host.getAppBaseFile(), standardContext.getPath()).isDirectory() && ( - new File(host.getAppBaseFile(), standardContext.getPath() + ".ear").exists() || - new File(host.getAppBaseFile(), standardContext.getPath() + ".rar").exists()) + if (host.getAutoDeploy() && new File(host.getAppBase(), standardContext.getPath()).isDirectory() && ( + new File(host.getAppBase(), standardContext.getPath() + ".ear").exists() || + new File(host.getAppBase(), standardContext.getPath() + ".rar").exists()) ) { logger.info(String.format("Not deploying exploded directory %s as Java EE artifact exists which will be deployed.", - new File(host.getAppBaseFile(), standardContext.getPath()).getAbsolutePath())); + new File(host.getAppBase(), standardContext.getPath()).getAbsolutePath())); return true; }
