svn commit: r575550 - /ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderServices.java

Author: jleroux
Date: Thu Sep 13 23:07:51 2007
New Revision: 575550

URL: http://svn.apache.org/viewvc?rev=575550&view=rev
Log:
Applied fix from trunk for revision: 562521

Modified:
    ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderServices.java

Modified: ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=575550&r1=575549&r2=575550&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/order/OrderServices.java Thu Sep 13 23:07:51 2007
@@ -1460,7 +1460,7 @@
                     shippingTotal = ZERO;
                     Debug.log("No valid order items found - " + shippingTotal, module);
                 } else {
-                    shippingTotal = new BigDecimal(((Double) shippingEstMap.get("shippingTotal")).doubleValue());
+                    shippingTotal = UtilValidate.isEmpty(shippingEstMap.get("shippingTotal")) ? ZERO : new BigDecimal(((Double) shippingEstMap.get("shippingTotal")).doubleValue());
                     shippingTotal = shippingTotal.setScale(orderDecimals, orderRounding);
                     Debug.log("Got new shipping estimate - " + shippingTotal, module);
                 }