Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java 13 Aug 2015 10:01:30 -0000 1.1.2.6 +++ lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java 11 Sep 2015 15:34:32 -0000 1.1.2.7 @@ -27,15 +27,11 @@ import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.lang.mutable.MutableInt; import org.apache.log4j.Logger; -import org.hibernate.FlushMode; -import org.hibernate.Session; -import org.hibernate.SessionFactory; import org.hibernate.exception.ConstraintViolationException; import org.hibernate.exception.LockAcquisitionException; import org.lamsfoundation.lams.util.ITransactionRetryService; import org.springframework.dao.CannotAcquireLockException; import org.springframework.dao.DataIntegrityViolationException; -import org.springframework.orm.hibernate3.SessionFactoryUtils; import org.springframework.transaction.UnexpectedRollbackException; /** @@ -49,7 +45,6 @@ private static final Logger log = Logger.getLogger(TransactionRetryInterceptor.class); private ITransactionRetryService transactionRetryService; - private SessionFactory sessionFactory; private static final int MAX_ATTEMPTS = 5; @@ -91,11 +86,6 @@ attempt.increment(); if (attempt.intValue() <= TransactionRetryInterceptor.MAX_ATTEMPTS) { message.append(". Retrying."); - - // the exception could have closed the session; try to recreate it here - Session session = SessionFactoryUtils.getSession(sessionFactory, true); - // same as in CustomizedOpenSessionInViewFilter - session.setFlushMode(FlushMode.AUTO); } else { message.append(". Giving up."); } @@ -105,8 +95,4 @@ public void setTransactionRetryService(ITransactionRetryService transactionRetryService) { this.transactionRetryService = transactionRetryService; } - - public void setSessionFactory(SessionFactory sessionFactory) { - this.sessionFactory = sessionFactory; - } } \ No newline at end of file