svn commit: r420365 - /incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/email/NotificationServices.java

[jonesde]

Author: jonesde
Date: Sun Jul  9 15:58:22 2006
New Revision: 420365

URL: http://svn.apache.org/viewvc?rev=420365&view=rev
Log:
Fixed reference to httpServer instead of httpsServer, bug reported by Scott Gray; also did some changes to be more robust with isEmpty instead of == null

Modified:
    incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/email/NotificationServices.java

Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/email/NotificationServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/email/NotificationServices.java?rev=420365&r1=420364&r2=420365&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/email/NotificationServices.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/email/NotificationServices.java Sun Jul  9 15:58:22 2006
@@ -40,6 +40,7 @@
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilURL;
+import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.template.FreeMarkerWorker;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
@@ -301,19 +302,19 @@
             }
             
             // fill in any missing properties with fields from the global file
-            if (httpsPort == null) {            
+            if (UtilValidate.isEmpty(httpsPort)) {            
                 httpsPort = UtilProperties.getPropertyValue("url.properties", "port.https", "443");
             }
-            if (httpServer == null) {            
+            if (UtilValidate.isEmpty(httpsServer)) {
                 httpsServer = UtilProperties.getPropertyValue("url.properties", "force.https.host", localServer);
             }
-            if (httpPort == null) {            
+            if (UtilValidate.isEmpty(httpPort)) {
                 httpPort = UtilProperties.getPropertyValue("url.properties", "port.http", "80");
             }
-            if (httpServer == null) {
+            if (UtilValidate.isEmpty(httpServer)) {
                 httpServer = UtilProperties.getPropertyValue("url.properties", "force.http.host", localServer);
             }
-            if (enableHttps == null) {
+            if (UtilValidate.isEmpty(enableHttps)) {
                 enableHttps = (UtilProperties.propertyValueEqualsIgnoreCase("url.properties", "port.https.enabled", "Y")) ? Boolean.TRUE : Boolean.FALSE;
             }