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

[mbrohl]

Author: mbrohl
Date: Thu Jan 10 16:07:56 2019
New Revision: 1850954

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

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

The name is now registered with the webbapp name prior to the context.

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 Thu Jan 10 16:07:56 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:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850918,1850921,1850948
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850918,1850921,1850948,1850953

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=1850954&r1=1850953&r2=1850954&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 Thu Jan 10 16:07:56 2019
@@ -500,12 +500,13 @@ 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());
         context.setJ2EEApplication("OFBiz");
         context.setJ2EEServer("OFBiz Container");
         context.setLoader(new WebappLoader(Thread.currentThread().getContextClassLoader()));
-        context.setDisplayName(appInfo.name);
         context.setDocBase(location);
         context.setReloadable(ContainerConfig.getPropertyValue(configuration, "apps-context-reloadable", false));
         context.setDistributable(contextIsDistributable);