Return-Path: Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: (qmail 30793 invoked from network); 16 Feb 2010 13:50:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Feb 2010 13:50:05 -0000 Received: (qmail 35374 invoked by uid 500); 16 Feb 2010 13:50:04 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 35294 invoked by uid 500); 16 Feb 2010 13:50:04 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 35285 invoked by uid 99); 16 Feb 2010 13:50:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Feb 2010 13:50:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Feb 2010 13:50:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 37F7F23888EC; Tue, 16 Feb 2010 13:49:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r910513 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Date: Tue, 16 Feb 2010 13:49:43 -0000 To: commits@ofbiz.apache.org From: ashish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100216134943.37F7F23888EC@eris.apache.org> Author: ashish Date: Tue Feb 16 13:49:42 2010 New Revision: 910513 URL: http://svn.apache.org/viewvc?rev=910513&view=rev Log: Applied patch from jira issue - OFBIZ-3478: Compares the specified object with this cart item is not in the right way. Thanks Amit for the contribution. 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=910513&r1=910512&r2=910513&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 Tue Feb 16 13:49:42 2010 @@ -2295,7 +2295,7 @@ return false; } - if (this.getSelectedAmount() != selectedAmount) { + if (selectedAmount != null && this.selectedAmount.compareTo(selectedAmount) != 0) { return false; } @@ -2306,11 +2306,11 @@ return false; } - if (this.reservLength != reservLength) { + if (reservLength != null && this.reservLength.compareTo(reservLength) != 0) { return false; } - if (this.reservPersons != reservPersons) { + if (reservPersons != null && this.reservPersons.compareTo(reservPersons) != 0) { return false; }