You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/03/15 10:26:58 UTC
svn commit: r1081692 -
/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
Author: hansbak
Date: Tue Mar 15 09:26:58 2011
New Revision: 1081692
URL: http://svn.apache.org/viewvc?rev=1081692&view=rev
Log:
look like a re-activation of a past feature: multiple <web-apps with the same mount-point however with different <virtual-host host-name specs
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=1081692&r1=1081691&r2=1081692&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 Mar 15 09:26:58 2011
@@ -632,7 +632,8 @@ public class CatalinaContainer implement
for (int i = webResourceInfos.size(); i > 0; i--) {
ComponentConfig.WebappInfo appInfo = webResourceInfos.get(i - 1);
String mount = appInfo.getContextRoot();
- if (!loadedMounts.contains(mount)) {
+ List<String> virtualHosts = appInfo.getVirtualHosts();
+ if (!loadedMounts.contains(mount) || UtilValidate.isNotEmpty(virtualHosts)) {
createContext(appInfo);
loadedMounts.add(mount);
} else {