svn commit: r902356 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java

[ashish-18]

Author: ashish
Date: Sat Jan 23 07:07:33 2010
New Revision: 902356

URL: http://svn.apache.org/viewvc?rev=902356&view=rev
Log:
Only call getExternalShipEstimate when "shippingContactMechId" is not null.
Patch from Amit Sharma.

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java?rev=902356&r1=902355&r2=902356&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java Sat Jan 23 07:07:33 2010
@@ -229,7 +229,10 @@
 
         // call the external shipping service
         try {
-            BigDecimal externalAmt = getExternalShipEstimate(dispatcher, storeShipMethod, serviceFields);
+            BigDecimal externalAmt = null;
+            if (UtilValidate.isNotEmpty(shippingContactMechId)) {
+                externalAmt = getExternalShipEstimate(dispatcher, storeShipMethod, serviceFields);
+            }
             if (externalAmt != null) {
                 shippingTotal = shippingTotal.add(externalAmt);
             }