You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ofbiz.apache.org by le...@apache.org on 2014/03/24 00:42:45 UTC

svn commit: r1580663 - /ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java

Author: lektran
Date: Sun Mar 23 23:42:45 2014
New Revision: 1580663

URL: http://svn.apache.org/r1580663
Log:
Merged from trunk r1580620:
Fix bug that causes a service to keep retrying after a deadlock occurs until lockRetriesRemaining reached zero

Modified:
    ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java

Modified: ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=1580663&r1=1580662&r2=1580663&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original)
+++ ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Sun Mar 23 23:42:45 2014
@@ -328,6 +328,9 @@ public class ServiceDispatcher {
                 boolean needsLockRetry = false;
 
                 do {
+                    // Ensure this is reset to false on each pass
+                    needsLockRetry = false;
+
                     lockRetriesRemaining--;
 
                     // NOTE: general pattern here is to do everything up to the main service call, and retry it all if