svn commit: r578290 - /ofbiz/branches/release4.0/framework/service/src/org/ofbiz/service/ServiceDispatcher.java

[jleroux]

Author: jleroux
Date: Fri Sep 21 15:18:37 2007
New Revision: 578290

URL: http://svn.apache.org/viewvc?rev=578290&view=rev
Log:
Applied fix from trunk for revision: 573300

Modified:
    
ofbiz/branches/release4.0/framework/service/src/org/ofbiz/service/ServiceDispatcher.java

Modified: 
ofbiz/branches/release4.0/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=578290&r1=578289&r2=578290&view=diff
==============================================================================
--- 
ofbiz/branches/release4.0/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
 (original)
+++ 
ofbiz/branches/release4.0/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
 Fri Sep 21 15:18:37 2007
@@ -298,11 +298,15 @@
 
             try {
                 // setup global transaction ECA listeners to execute later
-                if (eventMap != null) 
ServiceEcaUtil.evalRules(modelService.name, eventMap, "global-rollback", ctx, 
context, result, false, false);
-                if (eventMap != null) 
ServiceEcaUtil.evalRules(modelService.name, eventMap, "global-commit", ctx, 
context, result, false, false);
+                if (eventMap != null) 
ServiceEcaUtil.evalRules(modelService.name, eventMap, "global-rollback", ctx, 
context, result, isError, isFailure);
+                if (eventMap != null) 
ServiceEcaUtil.evalRules(modelService.name, eventMap, "global-commit", ctx, 
context, result, isError, isFailure);
 
                 // pre-auth ECA
-                if (eventMap != null) 
ServiceEcaUtil.evalRules(modelService.name, eventMap, "auth", ctx, context, 
result, false, false);
+                if (eventMap != null) 
ServiceEcaUtil.evalRules(modelService.name, eventMap, "auth", ctx, context, 
result, isError, isFailure);
+
+                // check for pre-auth failure/errors
+                isFailure = ServiceUtil.isFailure(result);
+                isError = ServiceUtil.isError(result);
 
                 context = checkAuth(localName, context, modelService);
                 Object userLogin = context.get("userLogin");
@@ -312,9 +316,9 @@
                 }
 
                 // pre-validate ECA
-                if (eventMap != null) 
ServiceEcaUtil.evalRules(modelService.name, eventMap, "in-validate", ctx, 
context, result, false, false);
+                if (eventMap != null) 
ServiceEcaUtil.evalRules(modelService.name, eventMap, "in-validate", ctx, 
context, result, isError, isFailure);
 
-                // check for pre-validate failure/erros
+                // check for pre-validate failure/errors
                 isFailure = ServiceUtil.isFailure(result);
                 isError = ServiceUtil.isError(result);
 
@@ -329,9 +333,9 @@
                 }
 
                 // pre-invoke ECA
-                if (eventMap != null) 
ServiceEcaUtil.evalRules(modelService.name, eventMap, "invoke", ctx, context, 
result, false, false);
+                if (eventMap != null) 
ServiceEcaUtil.evalRules(modelService.name, eventMap, "invoke", ctx, context, 
result, isError, isFailure);
 
-                // check for pre-invoke failure/erros
+                // check for pre-invoke failure/errors
                 isFailure = ServiceUtil.isFailure(result);
                 isError = ServiceUtil.isError(result);