svn commit: r1758780 - in /ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty: dhl/DhlServices.java ups/UpsServices.java

Author: jleroux
Date: Thu Sep  1 14:20:15 2016
New Revision: 1758780

URL: http://svn.apache.org/viewvc?rev=1758780&view=rev
Log:
No functional change, removes dead code

Modified:
    ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java
    ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java

Modified: ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java?rev=1758780&r1=1758779&r2=1758780&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java (original)
+++ ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java Thu Sep  1 14:20:15 2016
@@ -522,7 +522,6 @@ public class DhlServices {
                     "FacilityShipmentDhlGatewayNotAvailable", locale));
         }
         
-        String shipmentConfirmResponseString = null;
         try {
             GenericValue shipment = EntityQuery.use(delegator).from("Shipment").where("shipmentId", shipmentId).queryOne();
             if (shipment == null) {
@@ -809,20 +808,9 @@ public class DhlServices {
             return handleDhlShipmentConfirmResponse(responseString, shipmentRouteSegment, shipmentPackageRouteSegs, locale);
         } catch (GenericEntityException e) {
             Debug.logError(e, module);
-            if (shipmentConfirmResponseString != null) {
-                Debug.logError("Got XML ShipmentConfirmRespose: " + shipmentConfirmResponseString, module);
-                return ServiceUtil.returnError(UtilMisc.toList(
-                        UtilProperties.getMessage(resourceError,
-                                "FacilityShipmentFedexRateTemplateReadingError",
-                                UtilMisc.toMap("errorString", e.toString()), locale),
-                        UtilProperties.getMessage(resourceError,
-                                "FacilityShipmentFedexShipmentConfirmResponse",
-                                UtilMisc.toMap("shipmentConfirmResponseString", shipmentConfirmResponseString), locale)));
-            } else {
-                return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
-                        "FacilityShipmentFedexRateTemplateReadingError",
-                        UtilMisc.toMap("errorString", e.toString()), locale));
-            }
+            return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
+                    "FacilityShipmentFedexRateTemplateReadingError",
+                    UtilMisc.toMap("errorString", e.toString()), locale));
         } catch (GenericServiceException e) {
             Debug.logError(e, module);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,

Modified: ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=1758780&r1=1758779&r2=1758780&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java (original)
+++ ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java Thu Sep  1 14:20:15 2016
@@ -3120,17 +3120,8 @@ public class UpsServices {
                     ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
         } catch (GenericEntityException e) {
             Debug.logError(e, module);
-            if (rateResponseString != null) {
-                Debug.logError("Got XML ShipmentAlternateRatesInquiryResponse: " + rateResponseString, module);
-                return ServiceUtil.returnError(UtilMisc.toList(
-                        UtilProperties.getMessage(resourceError, "FacilityShipmentUpsErrorDataShipmentAccept",
-                        UtilMisc.toMap("errorString", e.toString()), locale),
-                        UtilProperties.getMessage(resourceError, "FacilityShipmentUpsShipmentAlternateRatesInquiryResponse",
-                                UtilMisc.toMap("rateResponseString", rateResponseString), locale)));
-            } else {
-                return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "FacilityShipmentUpsErrorDataShipmentAlternateRate",
-                        UtilMisc.toMap("errorString", e.toString()), locale));
-            }
+            return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "FacilityShipmentUpsErrorDataShipmentAlternateRate",
+                    UtilMisc.toMap("errorString", e.toString()), locale));
         }
     }