You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/10/18 22:13:19 UTC
svn commit: r1185831 -
/openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Author: rmannibucau
Date: Tue Oct 18 20:13:18 2011
New Revision: 1185831
URL: http://svn.apache.org/viewvc?rev=1185831&view=rev
Log:
OPENEJB-1523 seems we can deploy webapp from the host instead of the hostconfig and it is not linked to any event we don't manage
Modified:
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Modified: openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1185831&r1=1185830&r2=1185831&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Tue Oct 18 20:13:18 2011
@@ -226,17 +226,12 @@ public class TomcatWebAppBuilder impleme
String host = webApp.host;
if (host == null) {
host = "localhost";
+ logger.warning("using default host: " + host);
}
// TODO: instead of storing deployers, we could just lookup the right hostconfig for the server.
final HostConfig deployer = deployers.get(host);
- if (deployer != null) {
- // host isn't set until we call deployer.manageApp, so pass it
- ContextInfo contextInfo = addContextInfo(host, standardContext);
- contextInfo.appInfo = appInfo;
- contextInfo.deployer = deployer;
- deployer.manageApp(standardContext);
- } else if (hosts.containsKey(host)){
+ if (hosts.containsKey(host)){
Host theHost = hosts.get(host);
ContextInfo contextInfo = addContextInfo(host, standardContext);
@@ -244,6 +239,13 @@ public class TomcatWebAppBuilder impleme
contextInfo.host = theHost;
theHost.addChild(standardContext);
+ } else if (deployer != null) {
+ // host isn't set until we call deployer.manageApp, so pass it
+ // ?? host is set through an event and it can be null here :(
+ ContextInfo contextInfo = addContextInfo(host, standardContext);
+ contextInfo.appInfo = appInfo;
+ contextInfo.deployer = deployer;
+ deployer.manageApp(standardContext);
}
}
}