You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2011/01/20 10:07:20 UTC
svn commit: r1061167 -
/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
Author: jleroux
Date: Thu Jan 20 09:07:19 2011
New Revision: 1061167
URL: http://svn.apache.org/viewvc?rev=1061167&view=rev
Log:
A patch from Rene Scheibe "Invalid duplicate code in ShipmentServices" (https://issues.apache.org/jira/browse/OFBIZ-4128) - OFBIZ-4128
ShipmentServices contains some invalid duplicate code that doesn't perform a null check. I think it can just be removed as the correct code is located right below it.
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=1061167&r1=1061166&r2=1061167&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Thu Jan 20 09:07:19 2011
@@ -292,13 +292,6 @@ public class ShipmentServices {
// Get the PostalAddress
GenericValue shipAddress = null;
- try {
- shipAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId));
- } catch (GenericEntityException e) {
- return ServiceUtil.returnError(UtilProperties.getMessage(resource,
- "ProductShipmentCostEstimateCannotGetShippingAddress", locale));
- }
-
if (shippingContactMechId != null) {
try {
shipAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId));