[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    tomee git commit: Fixing error on previous commit, which checked for double deployment of EAR files
From:       jgallimore () apache ! org
Date:       2018-02-27 10:08:00
Message-ID: 680f527066f440b484423842dc378c6a () git ! apache ! org
[Download RAW message or body]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x b790b6d95 -> a96992c58


Fixing error on previous commit, which checked for double deployment of EAR files


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a96992c5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a96992c5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a96992c5

Branch: refs/heads/tomee-1.7.x
Commit: a96992c58132a1a51427e589697cf51c2de68b51
Parents: b790b6d
Author: Jonathan Gallimore <jon@jrg.me.uk>
Authored: Tue Feb 27 10:06:40 2018 +0000
Committer: Jonathan Gallimore <jon@jrg.me.uk>
Committed: Tue Feb 27 10:06:40 2018 +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/a96992c5/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 3c0739d..9dedc1e 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
 @@ -1434,10 +1434,10 @@ public class TomcatWebAppBuilder implements WebAppBuilder, \
ContextListener, Pare  
             final File appBase = new File(catalinaHome, host.getAppBase());
 
-            if (host.getAutoDeploy() && standardContext.getJ2EEApplication() != null \
                &&
-                    new File(appBase, \
                standardContext.getJ2EEApplication()).isDirectory() && (
-                    new File(appBase, standardContext.getJ2EEApplication() + \
                ".ear").exists() ||
-                    new File(appBase, standardContext.getJ2EEApplication() + \
".rar").exists()) +            if (host.getAutoDeploy() && \
standardContext.getDocBase() != null && +                    new File(appBase, \
standardContext.getDocBase()).isDirectory() && ( +                    new \
File(appBase, standardContext.getDocBase() + ".ear").exists() || +                    \
new File(appBase, standardContext.getDocBase() + ".rar").exists())  ) {
 
                 logger.info(String.format("Not deploying exploded directory %s as \
Java EE artifact exists which will be deployed.",


[prev in list] [next in list] [prev in thread] [next in thread]