svn commit: r1241370 - in /ofbiz/branches/release11.04: ./ applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java

Posted by on
URL: http://ofbiz.116.s1.nabble.com/svn-commit-r1241370-in-ofbiz-branches-release11-04-applications-order-src-org-ofbiz-order-shoppingcaa-tp4364019.html

Author: jleroux
Date: Tue Feb  7 08:03:00 2012
New Revision: 1241370

URL: http://svn.apache.org/viewvc?rev=1241370&view=rev
Log:
"Applied fix from trunk for revision: 1139860"
------------------------------------------------------------------------
r1139860 | doogie | 2011-06-26 20:08:10 +0200 (dim., 26 juin 2011) | 2 lines

FIX: When clearing the cart, also clear the attributes map
and orderAttributes list.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  7 08:03:00 2012
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4:951708-952957
 /ofbiz/branches/jquery:952958-1044489
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362,1210193,1210211,1212147,1214124,1220298,1221889,1221913,1222105,1222478,1226055,1226065,1226223,1226231,1227965,1229304,1229952,1231004,1231444,1232053,1232539
+/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1139860,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362,1210193,1210211,1212147,1214124,1220298,1221889,1221913,1222105,1222478,1226055,1226065,1226223,1226231,1227965,1229304,1229952,1231004,1231444,1232053,1232539

Modified: ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1241370&r1=1241369&r2=1241370&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Tue Feb  7 08:03:00 2012
@@ -1380,6 +1380,8 @@ public class ShoppingCart implements Ite
         this.contactMechIdsMap.clear();
         this.internalOrderNotes.clear();
         this.orderNotes.clear();
+        this.attributes.clear();
+        this.orderAttributes.clear();
 
         // clear the additionalPartyRole Map
         for (Map.Entry<String, List<String>> me : this.additionalPartyRole.entrySet()) {