svn commit: r796823 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java

[eckardjf]

Author: eckardjf
Date: Wed Jul 22 18:29:31 2009
New Revision: 796823

URL: http://svn.apache.org/viewvc?rev=796823&view=rev
Log:
productStore NPE fix when adding an item to the cart during PO entry (not using bulk add form)

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=796823&r1=796822&r2=796823&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Wed Jul 22 18:29:31 2009
@@ -486,6 +486,7 @@
         }
 
         GenericValue productStore = ProductStoreWorker.getProductStore(request);
+        if (productStore != null) {
         String addToCartRemoveIncompat = productStore.getString("addToCartRemoveIncompat");
         String addToCartReplaceUpsell = productStore.getString("addToCartReplaceUpsell");
         try {
@@ -544,6 +545,7 @@
         } catch (GenericEntityException e) {
             Debug.logError(e.getMessage(), module);
         }
+        }
 
         // Translate the parameters and add to the cart
         result = cartHelper.addToCart(catalogId, shoppingListId, shoppingListItemSeqId, productId, productCategoryId,