From 110d13a4ea80ab439d59fa1707a8105275af69c2 Mon Sep 17 00:00:00 2001 From: Michael Brohl Date: Thu, 10 Jan 2019 16:08:19 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1850955 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/ofbiz/catalina/container/CatalinaContainer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java index 891eecb28d..2f4a5a95d3 100644 --- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java +++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java @@ -502,12 +502,13 @@ public class CatalinaContainer implements Container { 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);