svn commit: r921288 - /ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java

[ashish-18]

Author: ashish
Date: Wed Mar 10 10:25:33 2010
New Revision: 921288

URL: http://svn.apache.org/viewvc?rev=921288&view=rev
Log:
Applied patch from jira issue OFBIZ-3547 - Improvement in equals method of ShoppingCartItem class.Thanks Awdesh for the contribution.

Modified:
    ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java

Modified: ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=921288&r1=921287&r2=921288&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Wed Mar 10 10:25:33 2010
@@ -2324,7 +2324,7 @@ public class ShoppingCartItem implements
             return false;
         }
 
-        if ((this.attributes != null && attributes != null) &&
+        if ((UtilValidate.isNotEmpty(this.attributes) && UtilValidate.isNotEmpty(attributes)) &&
                 ( (this.attributes.size() != attributes.size()) ||
                 !(this.attributes.equals(attributes)) )) {
             return false;