Author: jleroux
Date: Mon Feb 3 22:36:15 2014
New Revision: 1564119
URL: http://svn.apache.org/r1564119
Log:
"Applied fix from trunk for revision: 1564113"
------------------------------------------------------------------------
r1564113 | jleroux | 2014-02-03 23:33:09 +0100 (lun. 03 févr. 2014) | 2 lignes
When I replaced the deprecated findByPrimaryKey by a finByOne I forgot to put a
catch around, this fixes it.
Also removed an useless logError, ServiceUtil.returnError will take care of it
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1564113
Modified:
ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1564119&r1=1564118&r2=1564119&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
(original)
+++
ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
Mon Feb 3 22:36:15 2014
@@ -1417,7 +1417,11 @@ public class OrderReturnServices {
String orderPaymentPreferenceNewId = null;
Map<String, Object> result =
dispatcher.runSync("createOrderPaymentPreference", serviceContext);
orderPaymentPreferenceNewId = (String)
result.get("orderPaymentPreferenceId");
- refundOrderPaymentPreference =
delegator.findOne("OrderPaymentPreference", false, "orderPaymentPreferenceId",
orderPaymentPreferenceNewId);
+ try {
+ refundOrderPaymentPreference =
delegator.findOne("OrderPaymentPreference", false, "orderPaymentPreferenceId",
orderPaymentPreferenceNewId);
+ } catch (GenericEntityException e) {
+ return
ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderProblemsWithTheRefundSeeLogs",
locale));
+ }
serviceResult =
dispatcher.runSync("refundPayment", UtilMisc.<String,
Object>toMap("orderPaymentPreference", refundOrderPaymentPreference,
"refundAmount", amountToRefund.setScale(decimals, rounding), "userLogin",
userLogin));
if (ServiceUtil.isError(serviceResult) ||
ServiceUtil.isFailure(serviceResult)) {
Debug.logError("Error in refund
payment: " + ServiceUtil.getErrorMessage(serviceResult), module);
@@ -1427,7 +1431,6 @@ public class OrderReturnServices {
paymentId = (String)
serviceResult.get("paymentId");
amountRefunded = (BigDecimal)
serviceResult.get("refundAmount");
} catch (GenericServiceException e) {
- Debug.logError(e, "Problem running the
refundPayment service", module);
return
ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderProblemsWithTheRefundSeeLogs",
locale));
}
} else if
(paymentMethodTypeId.equals("EXT_BILLACT")) {
