Author: deepak
Date: Sat Mar 21 11:28:21 2015
New Revision: 1668240
URL: http://svn.apache.org/r1668240
Log:
Manually merged fix from trunk r#r1668236
============================================================
OFBIZ-6183: Update ComponentConfig code to allow empty mount point, as if need
to mount website on root then mount-point should be "" instead of "/".
Modified:
ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/component/ComponentConfig.java
Modified:
ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/component/ComponentConfig.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/component/ComponentConfig.java?rev=1668240&r1=1668239&r2=1668240&view=diff
==============================================================================
---
ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/component/ComponentConfig.java
(original)
+++
ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/component/ComponentConfig.java
Sat Mar 21 11:28:21 2015
@@ -769,13 +769,8 @@ public class ComponentConfig {
this.position = element.getAttribute("position");
- // default mount point is name if none specified
- if (UtilValidate.isEmpty(this.mountPoint)) {
- this.mountPoint = this.name;
- }
-
// check the mount point and make sure it is properly formatted
- if (!"/".equals(this.mountPoint)) {
+ if (UtilValidate.isNotEmpty(this.mountPoint)) {
if (!this.mountPoint.startsWith("/")) {
this.mountPoint = "/" + this.mountPoint;
}
