You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Ashish Vijaywargiya <vi...@gmail.com> on 2009/09/04 15:27:37 UTC
Re: svn commit: r810922 - in /ofbiz/branches/release09.04: ./
applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
framework/service/src/org/ofbiz/service/ServiceUtil.java
I received this & previous email Scott - so you can expect the same response
from Jacques :-)
--
Ashish
On Fri, Sep 4, 2009 at 5:42 PM, Scott Gray <sc...@hotwaxmedia.com>wrote:
> Hi Jacques,
>
> Did you receive this email?
>
> Thanks
> Scott
>
> HotWax Media
> http://www.hotwaxmedia.com
>
>
> On 4/09/2009, at 1:11 AM, Scott Gray wrote:
>
> That ServiceUtil method should not be added to the release branch.
>>
>> Regards
>> Scott
>>
>> On 4/09/2009, at 12:57 AM, jleroux@apache.org wrote:
>>
>> Author: jleroux
>>> Date: Thu Sep 3 12:57:32 2009
>>> New Revision: 810922
>>>
>>> URL: http://svn.apache.org/viewvc?rev=810922&view=rev
>>> Log:
>>> "Applied fix from trunk for revision: 810921"
>>> ------------------------------------------------------------------------
>>> r810921 | jleroux | 2009-09-03 14:54:16 +0200 (jeu., 03 sept. 2009) | 1
>>> line
>>>
>>> A patch from Bob Morley "loadCartFromOrder assumes service call is
>>> successful" (https://issues.apache.org/jira/browse/OFBIZ-2782) -
>>> OFBIZ-2782
>>> ------------------------------------------------------------------------
>>>
>>> Modified:
>>> ofbiz/branches/release09.04/ (props changed)
>>>
>>> ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
>>>
>>> ofbiz/branches/release09.04/framework/service/src/org/ofbiz/service/ServiceUtil.java
>>>
>>> Propchange: ofbiz/branches/release09.04/
>>>
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Thu Sep 3 12:57:32 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,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
>>> 836,810878,810917
>>>
>>> +/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,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
>>> 836,810878,810917,810921
>>>
>>> Modified:
>>> ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=810922&r1=810921&r2=810922&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
>>> (original)
>>> +++
>>> ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
>>> Thu Sep 3 12:57:32 2009
>>> @@ -1293,12 +1293,17 @@
>>>
>>> ShoppingCart cart = null;
>>> try {
>>> - Map outMap = dispatcher.runSync("loadCartFromOrder",
>>> + Map<String, Object> outMap =
>>> dispatcher.runSync("loadCartFromOrder",
>>> UtilMisc.<String,
>>> Object>toMap("orderId", quoteId,
>>>
>>> "skipProductChecks", Boolean.TRUE, // the products have already been checked
>>> in the order, no need to check their validity again
>>> "userLogin",
>>> userLogin));
>>> + if (!ServiceUtil.isSuccess(outMap)) {
>>> + request.setAttribute("_ERROR_MESSAGE_",
>>> ServiceUtil.getErrorMessage(outMap));
>>> + return "error";
>>> + }
>>>
>>> cart = (ShoppingCart) outMap.get("shoppingCart");
>>> +
>>> } catch (GenericServiceException exc) {
>>> request.setAttribute("_ERROR_MESSAGE_", exc.getMessage());
>>> return "error";
>>>
>>> Modified:
>>> ofbiz/branches/release09.04/framework/service/src/org/ofbiz/service/ServiceUtil.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/service/src/org/ofbiz/service/ServiceUtil.java?rev=810922&r1=810921&r2=810922&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/branches/release09.04/framework/service/src/org/ofbiz/service/ServiceUtil.java
>>> (original)
>>> +++
>>> ofbiz/branches/release09.04/framework/service/src/org/ofbiz/service/ServiceUtil.java
>>> Thu Sep 3 12:57:32 2009
>>> @@ -64,6 +64,14 @@
>>> return
>>> ModelService.RESPOND_FAIL.equals(results.get(ModelService.RESPONSE_MESSAGE));
>>> }
>>>
>>> + /** A little short-cut method to check to see if a service was
>>> successful (neither error or failed) */
>>> + public static boolean isSuccess(Map<String, ? extends Object>
>>> results) {
>>> + if (ServiceUtil.isError(results) ||
>>> ServiceUtil.isFailure(results)) {
>>> + return false;
>>> + }
>>> + return true;
>>> + }
>>> +
>>> /** A small routine used all over to improve code efficiency, make a
>>> result map with the message and the error response code */
>>> public static Map<String, Object> returnError(String errorMessage) {
>>> return returnProblem(ModelService.RESPOND_ERROR, errorMessage,
>>> null, null, null);
>>>
>>>
>>>
>>
>