Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-4311: JdbcLocks: QueryTimeoutException retry

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4311

* Added `QueryTimeoutException` to retry handling in the `JdbcLockRegistry`

Polishing

**Cherry-pick to 4.3.x**
This commit is contained in:
Kai Zimmermann
2017-07-11 16:25:45 +02:00
committed by Artem Bilan
parent d79e70c6df
commit c0d4375b1e
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/JdbcLockRegistry.java
View File

@@ -28,6 +28,7 @@ import java.util.concurrent.locks.ReentrantLock;
import org.springframework.dao.CannotAcquireLockException;
import org.springframework.dao.CannotSerializeTransactionException;
import org.springframework.dao.DataAccessResourceFailureException;
import org.springframework.dao.QueryTimeoutException;
import org.springframework.integration.support.locks.DefaultLockRegistry;
import org.springframework.integration.support.locks.ExpirableLockRegistry;
import org.springframework.integration.support.locks.LockRegistry;
@@ -45,6 +46,7 @@ import org.springframework.util.Assert;
* @author Dave Syer
* @author Artem Bilan
* @author Vedran Pavic
* @author Kai Zimmermann
*
* @since 4.3
*/
@@ -111,10 +113,7 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
}
break;
}
catch (CannotSerializeTransactionException e) {
// try again
}
catch (TransactionTimedOutException e) {
catch (CannotSerializeTransactionException | TransactionTimedOutException | QueryTimeoutException e) {
// try again
}
catch (InterruptedException e) {
@@ -148,10 +147,7 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
}
break;
}
catch (CannotSerializeTransactionException e) {
// try again
}
catch (TransactionTimedOutException e) {
catch (CannotSerializeTransactionException | TransactionTimedOutException | QueryTimeoutException e) {
// try again
}
catch (InterruptedException ie) {
@@ -195,10 +191,7 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
}
return acquired;
}
catch (CannotSerializeTransactionException e) {
// try again
}
catch (TransactionTimedOutException e) {
catch (CannotSerializeTransactionException | TransactionTimedOutException | QueryTimeoutException e) {
// try again
}
catch (Exception e) {