svn commit: r589992 - /ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java

[jo...@apache.org]

Author: jonesde
Date: Tue Oct 30 01:55:30 2007
New Revision: 589992

URL: http://svn.apache.org/viewvc?rev=589992&view=rev
Log:
A few cleanups to fail more elegantly when usps rate service isn't setup, ie with the default demo data

Modified:
    ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=589992&r1=589991&r2=589992&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java Tue Oct 30 01:55:30 2007
@@ -23,11 +23,14 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.*;
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import javolution.util.FastList;
+
 import org.ofbiz.base.util.*;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
@@ -183,6 +186,10 @@
             return ServiceUtil.returnError("Error sending request for USPS Domestic Rate Calculation service: " + e.getMessage());
         }
 
+        if (responseDocument == null) {
+            return ServiceUtil.returnError("No rate available at this time");
+        }
+        
         List rates = UtilXml.childElementList(responseDocument.getDocumentElement(), "Package");
         if (UtilValidate.isEmpty(rates)) {
             return ServiceUtil.returnError("No rate available at this time");
@@ -207,14 +214,14 @@
 
     private static List getPackageSplit(DispatchContext dctx, List shippableItemInfo, double maxWeight) {
         // create the package list w/ the first pacakge
-        List packages = new LinkedList();
+        List packages = FastList.newInstance();
 
         if (shippableItemInfo != null) {
             Iterator sii = shippableItemInfo.iterator();
             while (sii.hasNext()) {
                 Map itemInfo = (Map) sii.next();
                 long pieces = ((Long) itemInfo.get("piecesIncluded")).longValue();
-                double totalQuantity = ((Double) itemInfo.get("quantity")).doubleValue();
+                double totalQuantity = ((BigDecimal) itemInfo.get("quantity")).doubleValue();
                 double totalWeight = ((Double) itemInfo.get("weight")).doubleValue();
                 String productId = (String) itemInfo.get("productId");
 
@@ -1350,7 +1357,11 @@
         }
 
         Debug.logInfo("USPS response: " + responseString, module);
-
+        
+        if (UtilValidate.isEmpty(responseString)) {
+        	return null;
+        }
+ 
         Document responseDocument = null;
         try {
             responseDocument = UtilXml.readXmlDocument(responseString, false);