svn commit: r1643340 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java

Author: jleroux
Date: Fri Dec  5 16:08:50 2014
New Revision: 1643340

URL: http://svn.apache.org/r1643340
Log:
Fixes a possible NPE introduced in ShoppingCart.loadCartFromOrder() with OFBIZ-5761. Found while working on OFBIZ-5430

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

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1643340&r1=1643339&r2=1643340&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Fri Dec  5 16:08:50 2014
@@ -960,6 +960,7 @@ public class ShoppingCart implements Ite
     }
 
     /** Returns an iterator of cart items. */
+    @Override
     public Iterator<ShoppingCartItem> iterator() {
         return cartLines.iterator();
     }
@@ -2212,8 +2213,8 @@ public class ShoppingCart implements Ite
     public int getShipInfoIndex (String shipGroupSeqId) {
         int idx = -1;
         for (int i=0; i<shipInfo.size(); i++) {
-            CartShipInfo csi = (CartShipInfo) shipInfo.get(i);
-            if (csi.shipGroupSeqId.equals(shipGroupSeqId)) {
+            CartShipInfo csi = shipInfo.get(i);
+            if (shipGroupSeqId.equals(csi.shipGroupSeqId)) {
                 idx = i;
                 break;
             }
@@ -4327,6 +4328,7 @@ public class ShoppingCart implements Ite
             this.ascending = ascending;
         }
 
+        @Override
         public int compare(java.lang.Object obj, java.lang.Object obj1) {
             ShoppingCartItem cartItem = (ShoppingCartItem) obj;
             ShoppingCartItem cartItem1 = (ShoppingCartItem) obj1;
@@ -4456,6 +4458,7 @@ public class ShoppingCart implements Ite
             }
         }
 
+        @Override
         public int compareTo(ProductPromoUseInfo other) {
             return other.getUsageWeight().compareTo(getUsageWeight());
         }
@@ -4978,6 +4981,7 @@ public class ShoppingCart implements Ite
             return values;
         }
 
+        @Override
         public int compareTo(Object o) {
             CartPaymentInfo that = (CartPaymentInfo) o;
             Debug.logInfo("Compare [" + this.toString() + "] to [" + that.toString() + "]", module);