You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2013/11/07 02:55:07 UTC
svn commit: r1539513 -
/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
Author: adrianc
Date: Thu Nov 7 01:55:06 2013
New Revision: 1539513
URL: http://svn.apache.org/r1539513
Log:
Improved WebSiteProperties.java - better handling of missing values.
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java?rev=1539513&r1=1539512&r2=1539513&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java Thu Nov 7 01:55:06 2013
@@ -55,19 +55,49 @@ public final class WebSiteProperties {
Assert.notNull("request", request);
WebSiteProperties webSiteProps = (WebSiteProperties) request.getAttribute("_WEBSITE_PROPS_");
if (webSiteProps == null) {
+ WebSiteProperties defaults = new WebSiteProperties();
+ String httpPort = defaults.getHttpPort();
+ String httpHost = defaults.getHttpHost();
+ String httpsPort = defaults.getHttpsPort();
+ String httpsHost = defaults.getHttpsHost();
+ boolean enableHttps = defaults.getEnableHttps();
Delegator delegator = (Delegator) request.getAttribute("delegator");
if (delegator != null) {
String webSiteId = WebSiteWorker.getWebSiteId(request);
if (webSiteId != null) {
GenericValue webSiteValue = delegator.findOne("WebSite", UtilMisc.toMap("webSiteId", webSiteId), true);
if (webSiteValue != null) {
- webSiteProps = from(webSiteValue);
+ if (webSiteValue.get("httpPort") != null) {
+ httpPort = webSiteValue.getString("httpPort");
+ }
+ if (webSiteValue.get("httpHost") != null) {
+ httpHost = webSiteValue.getString("httpHost");
+ }
+ if (webSiteValue.get("httpsPort") != null) {
+ httpsPort = webSiteValue.getString("httpsPort");
+ }
+ if (webSiteValue.get("httpsHost") != null) {
+ httpsHost = webSiteValue.getString("httpsHost");
+ }
+ if (webSiteValue.get("enableHttps") != null) {
+ enableHttps = webSiteValue.getBoolean("enableHttps");
+ }
}
}
}
- if (webSiteProps == null) {
- webSiteProps = new WebSiteProperties();
+ if (httpPort.isEmpty() && !request.isSecure()) {
+ httpPort = String.valueOf(request.getServerPort());
}
+ if (httpHost.isEmpty() && !request.isSecure()) {
+ httpHost = request.getServerName();
+ }
+ if (httpsPort.isEmpty() && request.isSecure()) {
+ httpsPort = String.valueOf(request.getServerPort());
+ }
+ if (httpsHost.isEmpty() && request.isSecure()) {
+ httpsHost = request.getServerName();
+ }
+ webSiteProps = new WebSiteProperties(httpPort, httpHost, httpsPort, httpsHost, enableHttps);
request.setAttribute("_WEBSITE_PROPS_", webSiteProps);
}
return webSiteProps;