svn commit: r909310 - /ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java

[rr]

Author: rr
Date: Fri Feb 12 09:40:00 2010
New Revision: 909310

URL: http://svn.apache.org/viewvc?rev=909310&view=rev
Log:
Added retryFor handling while faultOnFailure is true

Modified:
    
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java

Modified: 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java?rev=909310&r1=909309&r2=909310&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
 Fri Feb 12 09:40:00 2010
@@ -256,8 +256,8 @@
                     _failure.data = data;
 
                     OFailureHandling failureHandling = getFailureHandling();
-                    if (failureHandling != null && 
failureHandling.faultOnFailure) {
-                      // No attempt to retry or enter activity recovery state, 
simply fault.
+                    if (failureHandling != null && 
failureHandling.faultOnFailure && _failure.retryCount >= 
failureHandling.retryFor) {
+                        //Fault after retries (may be 0)
                         if (__log.isDebugEnabled())
                             __log.debug("ActivityRecovery: Activity " + 
_self.aId + " faulting on failure");
                         FaultData faultData = 
createFault(OFailureHandling.FAILURE_FAULT_NAME, _oactivity, reason);