svn commit: r1608493 - in /ofbiz/branches/release12.04: ./ applications/product/src/org/ofbiz/shipment/packing/PackingSession.java

Author: jleroux
Date: Mon Jul  7 15:34:58 2014
New Revision: 1608493

URL: http://svn.apache.org/r1608493
Log:
"Applied fix from trunk for revision: 1608491"
------------------------------------------------------------------------
r1608491 | jleroux | 2014-07-07 17:33:19 +0200 (lun. 07 juil. 2014) | 1 ligne

Fixes a wrong NPE check
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1608491

Modified: ofbiz/branches/release12.04/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=1608493&r1=1608492&r2=1608493&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original)
+++ ofbiz/branches/release12.04/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Mon Jul  7 15:34:58 2014
@@ -934,7 +934,7 @@ public class PackingSession implements j
             Debug.logError(e, module);
         }
 
-        if (! UtilValidate.isEmpty(serviceResult.get("shippingEstimateAmount"))) {
+        if (!UtilValidate.isEmpty(serviceResult)) {
             shipmentCostEstimate = (BigDecimal) serviceResult.get("shippingEstimateAmount");
         }