fixed unbind failure through appropriate guard

jhoeller · jhoeller · commit cfb380d65354 · 2011-10-11T02:08:26.000Z
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/org.springframework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
@@ -154,7 +154,10 @@ public SessionTransactionData(Session session, FlushMode previousFlushMode) {
 		}
 
 		public void cleanup() {
-			TransactionSynchronizationManager.unbindResource(this.session.getSessionFactory());
+			SessionFactory sessionFactory = this.session.getSessionFactory();
+			if (TransactionSynchronizationManager.hasResource(sessionFactory)) {
+				TransactionSynchronizationManager.unbindResource(sessionFactory);
+			}
 			if (this.previousFlushMode != null) {
 				this.session.setFlushMode(this.previousFlushMode);
 			}

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,10 @@ public SessionTransactionData(Session session, FlushMode previousFlushMode) {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`public void cleanup() {`
`157`		`- TransactionSynchronizationManager.unbindResource(this.session.getSessionFactory());`
	`157`	`+ SessionFactory sessionFactory = this.session.getSessionFactory();`
	`158`	`+ if (TransactionSynchronizationManager.hasResource(sessionFactory)) {`
	`159`	`+ TransactionSynchronizationManager.unbindResource(sessionFactory);`
	`160`	`+ }`
`158`	`161`	`if (this.previousFlushMode != null) {`
`159`	`162`	`this.session.setFlushMode(this.previousFlushMode);`
`160`	`163`	`}`