fixed JPA 2.0 timeout hints to correctly specify milliseconds (SPR-8086)

14 years ago · a966cba97f
parent c303b22e30
commit a966cba97f
1 changed files with 1 additions and 1 deletions
--- a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
+++ b/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
@ -257,7 +257,7 @@ public abstract class EntityManagerFactoryUtils {
 	public static void applyTransactionTimeout(Query query, EntityManagerFactory emf) {
 		EntityManagerHolder emHolder = (EntityManagerHolder) TransactionSynchronizationManager.getResource(emf);
 		if (emHolder != null && emHolder.hasTimeout()) {
-			int timeoutValue = emHolder.getTimeToLiveInSeconds();
+			int timeoutValue = (int) emHolder.getTimeToLiveInMillis();
 			query.setHint("javax.persistence.lock.timeout", timeoutValue);
 			query.setHint("javax.persistence.query.timeout", timeoutValue);
 		}