Author: ashish
Date: Tue Mar 12 04:54:58 2013
New Revision: 1455410
URL: http://svn.apache.org/r1455410
Log:
Applied bug fix from trunk revision: 1455407
Bug Fix: Added check to avoid NPE if result-to-result is true.
If we set result-to-result true then for some cases actionResult may be empty
so it throws an NPE action while executing eca action. Thanks Deepak.
Modified:
ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java
Modified:
ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java?rev=1455410&r1=1455409&r2=1455410&view=diff
==============================================================================
---
ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java
(original)
+++
ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java
Tue Mar 12 04:54:58 2013
@@ -191,7 +191,7 @@ public class ServiceEcaAction implements
}
// copy/combine error messages on error/failure (!success) or on
resultToResult to combine any error info coming out, regardless of success
status
- if (!success || resultToResult) {
+ if ((!success || resultToResult) &&
UtilValidate.isNotEmpty(actionResult)) {
String errorMessage = (String)
actionResult.get(ModelService.ERROR_MESSAGE);
String failMessage = (String) actionResult.get("failMessage");
List<? extends Object> errorMessageList =
UtilGenerics.checkList(actionResult.get(ModelService.ERROR_MESSAGE_LIST));
