svn commit: r1204920 - /ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

[hansbak-2]

Author: hansbak
Date: Tue Nov 22 11:05:22 2011
New Revision: 1204920

URL: http://svn.apache.org/viewvc?rev=1204920&view=rev
Log:
problem with multiple virtual hosts in tomcat 7 contribution by Chatree https://issues.apache.org/jira/browse/OFBIZ-4571

Modified:
    ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1204920&r1=1204919&r2=1204920&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Tue Nov 22 11:05:22 2011
@@ -291,6 +291,7 @@ public class CatalinaContainer implement
         // create a default virtual host; others will be created as needed
         Host host = createHost(engine, hostName);
         hosts.put(engineName + "._DEFAULT", host);
+        engine.addChild(host);
 
         // configure clustering
         List<ContainerConfig.Container.Property> clusterProps = engineConfig.getPropertiesWithValue("cluster");
@@ -378,7 +379,6 @@ public class CatalinaContainer implement
         host.setBackgroundProcessorDelay(5);
         host.setAutoDeploy(false);
         host.setRealm(engine.getRealm());
-        engine.addChild(host);
         hosts.put(engine.getName() + hostName, host);
 
         return host;
@@ -580,6 +580,7 @@ public class CatalinaContainer implement
 
             if (newHost) {
                 hosts.put(engine.getName() + "." + hostName, host);
+                engine.addChild(host);
             }
         }