svn commit: r1858348 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java

[mbrohl]

Author: mbrohl
Date: Mon Apr 29 08:48:54 2019
New Revision: 1858348

URL: http://svn.apache.org/viewvc?rev=1858348&view=rev
Log:
Applied fix from trunk for revision: 1858347
===

Fixed: Failed registration for virtual hosts with similar mount points
(OFBIZ-10765)

The default host is now retrieved using the API instead of simply
retrieving the 1st host through Tomcat.getHost().

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 29 08:48:54 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347

Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java?rev=1858348&r1=1858347&r2=1858348&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java Mon Apr 29 08:48:54 2019
@@ -218,7 +218,10 @@ public class CatalinaContainer implement
         Host host;
 
         if (UtilValidate.isEmpty(virtualHosts)) {
-            host = tomcat.getHost();
+            host = (Host) tomcat.getEngine().findChild(tomcat.getEngine().getDefaultHost());
+            if(host == null) {
+                host = tomcat.getHost();
+            }
         } else {
             host = prepareVirtualHost(tomcat, virtualHosts);
         }
@@ -484,6 +487,7 @@ public class CatalinaContainer implement
 
         return () -> {
             StandardContext context = prepareContext(host, configuration, appInfo, clusterProp);
+            Debug.logInfo("host[" + host + "].addChild(" + context + ")", module);
             host.addChild(context);
             return context;
         };
@@ -500,7 +504,6 @@ public class CatalinaContainer implement
 
         context.setParent(host);
         context.setDocBase(location);
-        context.setName(appInfo.name);
         context.setDisplayName(appInfo.name);
         context.setPath(getWebappMountPoint(appInfo));
         context.addLifecycleListener(new ContextConfig());