|
20 | 20 | import java.util.LinkedHashSet; |
21 | 21 | import java.util.Map; |
22 | 22 | import java.util.Set; |
23 | | - |
24 | 23 | import javax.sql.DataSource; |
25 | 24 | import javax.transaction.Status; |
26 | 25 | import javax.transaction.Transaction; |
|
57 | 56 | import org.hibernate.exception.JDBCConnectionException; |
58 | 57 | import org.hibernate.exception.LockAcquisitionException; |
59 | 58 | import org.hibernate.exception.SQLGrammarException; |
| 59 | + |
60 | 60 | import org.springframework.core.NamedThreadLocal; |
61 | 61 | import org.springframework.dao.CannotAcquireLockException; |
62 | 62 | import org.springframework.dao.DataAccessException; |
|
91 | 91 | * and {@link HibernateTransactionManager}. Can also be used directly in |
92 | 92 | * application code. |
93 | 93 | * |
94 | | - * <p>Requires Hibernate 3.6 or later, as of Spring 4.0. |
| 94 | + * <p>Requires Hibernate 3.6.x, as of Spring 4.0. |
95 | 95 | * |
96 | 96 | * @author Juergen Hoeller |
97 | 97 | * @since 1.2 |
@@ -618,10 +618,12 @@ public static void applyTransactionTimeout(Query query, SessionFactory sessionFa |
618 | 618 | */ |
619 | 619 | public static void applyTransactionTimeout(Criteria criteria, SessionFactory sessionFactory) { |
620 | 620 | Assert.notNull(criteria, "No Criteria object specified"); |
621 | | - SessionHolder sessionHolder = |
622 | | - (SessionHolder) TransactionSynchronizationManager.getResource(sessionFactory); |
623 | | - if (sessionHolder != null && sessionHolder.hasTimeout()) { |
624 | | - criteria.setTimeout(sessionHolder.getTimeToLiveInSeconds()); |
| 621 | + if (sessionFactory != null) { |
| 622 | + SessionHolder sessionHolder = |
| 623 | + (SessionHolder) TransactionSynchronizationManager.getResource(sessionFactory); |
| 624 | + if (sessionHolder != null && sessionHolder.hasTimeout()) { |
| 625 | + criteria.setTimeout(sessionHolder.getTimeToLiveInSeconds()); |
| 626 | + } |
625 | 627 | } |
626 | 628 | } |
627 | 629 |
|
|
0 commit comments