You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/05/11 20:27:02 UTC
svn commit: r773643 - in /ofbiz/branches/release09.04: ./
applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
Author: jleroux
Date: Mon May 11 18:27:01 2009
New Revision: 773643
URL: http://svn.apache.org/viewvc?rev=773643&view=rev
Log:
"Applied fix from trunk for revision: 773628"
------------------------------------------------------------------------
r773628 | jleroux | 2009-05-11 19:33:31 +0200 (lun., 11 mai 2009) | 4 lines
Introducing "OFB" in entitengine.xml had a little impact here.
Not sure it's the best solution, but at least it's the simplest. Because else we will have also to change how ShoppingCart.setNextItemSeq() works, etc.
Maybe there are other places where "OFB" has an impact...
------------------------------------------------------------------------
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 11 18:27:01 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628
Modified: ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=773643&r1=773642&r2=773643&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Mon May 11 18:27:01 2009
@@ -304,6 +304,7 @@
for (GenericValue item : orderItems) {
// get the next item sequence id
String orderItemSeqId = item.getString("orderItemSeqId");
+ orderItemSeqId = orderItemSeqId.replaceAll("\\P{Digit}", "");
try {
long seq = Long.parseLong(orderItemSeqId);
if (seq > nextItemSeq) {
@@ -671,6 +672,7 @@
for(GenericValue quoteItem : quoteItems) {
// get the next item sequence id
String orderItemSeqId = quoteItem.getString("quoteItemSeqId");
+ orderItemSeqId = orderItemSeqId.replaceAll("\\P{Digit}", "");
try {
long seq = Long.parseLong(orderItemSeqId);
if (seq > nextItemSeq) {
@@ -857,6 +859,7 @@
for(GenericValue shoppingListItem : shoppingListItems) {
// get the next item sequence id
String orderItemSeqId = shoppingListItem.getString("shoppingListItemSeqId");
+ orderItemSeqId = orderItemSeqId.replaceAll("\\P{Digit}", "");
try {
long seq = Long.parseLong(orderItemSeqId);
if (seq > nextItemSeq) {
Re: svn commit: r773643 - in /ofbiz/branches/release09.04: ./ applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
Posted by Jacques Le Roux <ja...@les7arts.com>.
Actually this was not needed, as "OFB" has been reverted at r765067. I still had it in one of my entityengine.xml instances because
of my own changes, so the svn line by line merging process kept it.
But anyway, it solves a potential bug that would appear if someone introduces a non numerix prefix using sequenced-id-prefix. So I
keep these changes either in trunk and R9.04
Jacques
From: <jl...@apache.org>
> Author: jleroux
> Date: Mon May 11 18:27:01 2009
> New Revision: 773643
>
> URL: http://svn.apache.org/viewvc?rev=773643&view=rev
> Log:
> "Applied fix from trunk for revision: 773628"
> ------------------------------------------------------------------------
> r773628 | jleroux | 2009-05-11 19:33:31 +0200 (lun., 11 mai 2009) | 4 lines
>
> Introducing "OFB" in entitengine.xml had a little impact here.
> Not sure it's the best solution, but at least it's the simplest. Because else we will have also to change how
> ShoppingCart.setNextItemSeq() works, etc.
> Maybe there are other places where "OFB" has an impact...
>
> ------------------------------------------------------------------------
>
>
> Modified:
> ofbiz/branches/release09.04/ (props changed)
> ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
>
> Propchange: ofbiz/branches/release09.04/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon May 11 18:27:01 2009
> @@ -1 +1 @@
> -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557
> +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628
>
> Modified: ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=773643&r1=773642&r2=773643&view=diff
> ==============================================================================
> --- ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
> +++ ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Mon May 11 18:27:01
> 2009
> @@ -304,6 +304,7 @@
> for (GenericValue item : orderItems) {
> // get the next item sequence id
> String orderItemSeqId = item.getString("orderItemSeqId");
> + orderItemSeqId = orderItemSeqId.replaceAll("\\P{Digit}", "");
> try {
> long seq = Long.parseLong(orderItemSeqId);
> if (seq > nextItemSeq) {
> @@ -671,6 +672,7 @@
> for(GenericValue quoteItem : quoteItems) {
> // get the next item sequence id
> String orderItemSeqId = quoteItem.getString("quoteItemSeqId");
> + orderItemSeqId = orderItemSeqId.replaceAll("\\P{Digit}", "");
> try {
> long seq = Long.parseLong(orderItemSeqId);
> if (seq > nextItemSeq) {
> @@ -857,6 +859,7 @@
> for(GenericValue shoppingListItem : shoppingListItems) {
> // get the next item sequence id
> String orderItemSeqId = shoppingListItem.getString("shoppingListItemSeqId");
> + orderItemSeqId = orderItemSeqId.replaceAll("\\P{Digit}", "");
> try {
> long seq = Long.parseLong(orderItemSeqId);
> if (seq > nextItemSeq) {
>
>