Author: lektran
Date: Sat Apr 28 10:30:40 2012
New Revision: 1331741
URL: http://svn.apache.org/viewvc?rev=1331741&view=rev
Log:
Fix potential (but unlikely) NPE
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1331741&r1=1331740&r2=1331741&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
(original)
+++
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
Sat Apr 28 10:30:40 2012
@@ -509,11 +509,11 @@ public class CheckOutEvents {
GenericValue productStore = null;
try {
productStore = delegator.findByPrimaryKeyCache("ProductStore",
UtilMisc.toMap("productStoreId", cart.getProductStoreId()));
+ Debug.logInfo("checkShipmentNeeded: reqShipAddrForDigItems=" +
productStore.getString("reqShipAddrForDigItems"), module);
} catch (GenericEntityException e) {
Debug.logError(e, "Error getting ProductStore: " + e.toString(),
module);
}
- Debug.logInfo("checkShipmentNeeded: reqShipAddrForDigItems=" +
productStore.getString("reqShipAddrForDigItems"), module);
if (productStore != null &&
"N".equals(productStore.getString("reqShipAddrForDigItems"))) {
Debug.logInfo("checkShipmentNeeded:
cart.containOnlyDigitalGoods()=" + cart.containOnlyDigitalGoods(), module);
// don't require shipping for all digital items