svn commit: r683930 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java

[mor-2]

Author: mor
Date: Fri Aug  8 03:20:16 2008
New Revision: 683930

URL: http://svn.apache.org/viewvc?rev=683930&view=rev
Log:
Fix - Adding same variants more then once to cart are displayed as separate cart items. Reported and fix provided by Mridul Pathak

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

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=683930&r1=683929&r2=683930&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Fri Aug  8 03:20:16 2008
@@ -2283,7 +2283,7 @@
             return false;
         }
 
-        if ((this.additionalProductFeatureAndAppls != null && additionalProductFeatureAndAppls != null) &&
+        if ((UtilValidate.isNotEmpty(this.additionalProductFeatureAndAppls) && UtilValidate.isNotEmpty(additionalProductFeatureAndAppls)) &&
                 (this.additionalProductFeatureAndAppls.size() != additionalProductFeatureAndAppls.size()) &&
                 !(this.additionalProductFeatureAndAppls.equals(additionalProductFeatureAndAppls))) {
             return false;