svn commit: r1784559 - in /ofbiz/branches/release16.11: ./ framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java

Author: jleroux
Date: Mon Feb 27 13:14:58 2017
New Revision: 1784559

URL: http://svn.apache.org/viewvc?rev=1784559&view=rev
Log:
"Applied fix from trunk framework for revision: 1784558"
------------------------------------------------------------------------
r1784558 | jleroux | 2017-02-27 14:14:39 +0100 (lun. 27 févr. 2017) | 1 ligne

No functional change, cleaner code
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 13:14:58 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java?rev=1784559&r1=1784558&r2=1784559&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java (original)
+++ ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java Mon Feb 27 13:14:58 2017
@@ -108,11 +108,12 @@ public final class WebSiteProperties {
                 httpPort = httpPortValue.toString();
                 if (!dontAdd) {
                     Integer httpsPortValue = Integer.valueOf(httpsPort);
-                    if (! httpsPort.isEmpty())
-                    httpsPortValue += Start.getInstance().getConfig().portOffset;
+                    if (!httpsPort.isEmpty()) {
+                        httpsPortValue += Start.getInstance().getConfig().portOffset;
+                    }
                     httpsPort = httpsPortValue.toString();
                 }
-            }                
+            }
             
             webSiteProps = new WebSiteProperties(httpPort, httpHost, httpsPort, httpsHost, enableHttps);
             request.setAttribute("_WEBSITE_PROPS_", webSiteProps);
@@ -145,7 +146,7 @@ public final class WebSiteProperties {
             Integer httpsPortValue = Integer.valueOf(httpsPort);
             httpsPortValue += Start.getInstance().getConfig().portOffset; // Here unlike above we trust the user and don't rely on the request, no dontAdd.
             httpsPort = httpsPortValue.toString();
-        }                
+        }
         
         return new WebSiteProperties(httpPort, httpHost, httpsPort, httpsHost, enableHttps);
     }