svn commit: r1580635 - /ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java

[lektran]

Author: lektran
Date: Sun Mar 23 22:11:13 2014
New Revision: 1580635

URL: http://svn.apache.org/r1580635
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/release12.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java

Modified: ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=1580635&r1=1580634&r2=1580635&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original)
+++ ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Sun Mar 23 22:11:13 2014
@@ -322,6 +322,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