Author: lektran Date: Sun Mar 23 21:55:55 2014 New Revision: 1580627 URL: http://svn.apache.org/r1580627 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/release13.07/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Modified: ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/ServiceDispatcher.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=1580627&r1=1580626&r2=1580627&view=diff ============================================================================== --- ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original) +++ ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Sun Mar 23 21:55:55 2014 @@ -317,6 +317,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