svn commit: r550433 - /ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java

[lektran]

Author: lektran
Date: Mon Jun 25 02:38:42 2007
New Revision: 550433

URL: http://svn.apache.org/viewvc?view=rev&rev=550433
Log:
Applied fix from trunk for revision: 550232

Modified:
    ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java

Modified: ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?view=diff&rev=550433&r1=550432&r2=550433
==============================================================================
--- ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Mon Jun 25 02:38:42 2007
@@ -1688,12 +1688,12 @@
             Double depth = product.getDouble("shippingDepth");
 
             // if all are null, see if there is an associated virtual product and get the info of that product
-            if (height == null & width == null && depth == null) {
+            if (height == null && width == null && depth == null) {
                 GenericValue parentProduct = this.getParentProduct();
                 if (parentProduct != null) {
                     height = parentProduct.getDouble("shippingHeight");
-                    width = product.getDouble("shippingWidth");
-                    depth = product.getDouble("shippingDepth");
+                    width = parentProduct.getDouble("shippingWidth");
+                    depth = parentProduct.getDouble("shippingDepth");
                 }
             }