Resource-based PlatformTransactionManager implementations defensively catch Throwable in doBegin in order to reliably close resource in case of OutOfMemoryError

jhoeller · unknown · commit 2e4eb9fc10f6 · 2013-07-24T15:29:10.000+02:00
Issue: SPR-10755
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
@@ -238,7 +238,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			}
 		}
 
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			DataSourceUtils.releaseConnection(con, this.dataSource);
 			throw new CannotCreateTransactionException("Could not open JDBC Connection for transaction", ex);
 		}
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -196,7 +196,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			TransactionSynchronizationManager.bindResource(
 					getConnectionFactory(), txObject.getResourceHolder());
 		}
-		catch (JMSException ex) {
+		catch (Throwable ex) {
 			if (con != null) {
 				try {
 					con.close();
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java
@@ -500,7 +500,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			txObject.getSessionHolder().setSynchronizedWithTransaction(true);
 		}
 
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			if (txObject.isNewSession()) {
 				try {
 					if (session.getTransaction().isActive()) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java
@@ -583,7 +583,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			txObject.getSessionHolder().setSynchronizedWithTransaction(true);
 		}
 
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			if (txObject.isNewSession()) {
 				try {
 					if (session.getTransaction().isActive()) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java
@@ -366,7 +366,7 @@ public int getTimeout() {
 			closePersistenceManagerAfterFailedBegin(txObject);
 			throw ex;
 		}
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			closePersistenceManagerAfterFailedBegin(txObject);
 			throw new CannotCreateTransactionException("Could not open JDO PersistenceManager for transaction", ex);
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
@@ -425,7 +425,7 @@ public int getTimeout() {
 			closeEntityManagerAfterFailedBegin(txObject);
 			throw ex;
 		}
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			closeEntityManagerAfterFailedBegin(txObject);
 			throw new CannotCreateTransactionException("Could not open JPA EntityManager for transaction", ex);
 		}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@
 import org.springframework.transaction.TransactionSystemException;
 import org.springframework.transaction.support.AbstractPlatformTransactionManager;
 import org.springframework.transaction.support.DefaultTransactionStatus;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.transaction.support.ResourceTransactionManager;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
  * {@link org.springframework.transaction.PlatformTransactionManager} implementation
@@ -141,7 +141,6 @@ protected boolean isExistingTransaction(Object transaction) {
 	@Override
 	protected void doBegin(Object transaction, TransactionDefinition definition) {
 		CciLocalTransactionObject txObject = (CciLocalTransactionObject) transaction;
-
 		Connection con = null;
 
 		try {
@@ -169,7 +168,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			ConnectionFactoryUtils.releaseConnection(con, getConnectionFactory());
 			throw new CannotCreateTransactionException("Could not begin local CCI transaction", ex);
 		}
-		catch (ResourceException ex) {
+		catch (Throwable ex) {
 			ConnectionFactoryUtils.releaseConnection(con, getConnectionFactory());
 			throw new TransactionSystemException("Unexpected failure on begin of CCI local transaction", ex);
 		}

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`
`241`		`- catch (Exception ex) {`
	`241`	`+ catch (Throwable ex) {`
`242`	`242`	`DataSourceUtils.releaseConnection(con, this.dataSource);`
`243`	`243`	`throw new CannotCreateTransactionException("Could not open JDBC Connection for transaction", ex);`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {`
`500`	`500`	`txObject.getSessionHolder().setSynchronizedWithTransaction(true);`
`501`	`501`	`}`
`502`	`502`
`503`		`- catch (Exception ex) {`
	`503`	`+ catch (Throwable ex) {`
`504`	`504`	`if (txObject.isNewSession()) {`
`505`	`505`	`try {`
`506`	`506`	`if (session.getTransaction().isActive()) {`
Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {`
`583`	`583`	`txObject.getSessionHolder().setSynchronizedWithTransaction(true);`
`584`	`584`	`}`
`585`	`585`
`586`		`- catch (Exception ex) {`
	`586`	`+ catch (Throwable ex) {`
`587`	`587`	`if (txObject.isNewSession()) {`
`588`	`588`	`try {`
`589`	`589`	`if (session.getTransaction().isActive()) {`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ public int getTimeout() {`
`366`	`366`	`closePersistenceManagerAfterFailedBegin(txObject);`
`367`	`367`	`throw ex;`
`368`	`368`	`}`
`369`		`- catch (Exception ex) {`
	`369`	`+ catch (Throwable ex) {`
`370`	`370`	`closePersistenceManagerAfterFailedBegin(txObject);`
`371`	`371`	`throw new CannotCreateTransactionException("Could not open JDO PersistenceManager for transaction", ex);`
`372`	`372`	`}`
Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ public int getTimeout() {`
`425`	`425`	`closeEntityManagerAfterFailedBegin(txObject);`
`426`	`426`	`throw ex;`
`427`	`427`	`}`
`428`		`- catch (Exception ex) {`
	`428`	`+ catch (Throwable ex) {`
`429`	`429`	`closeEntityManagerAfterFailedBegin(txObject);`
`430`	`430`	`throw new CannotCreateTransactionException("Could not open JPA EntityManager for transaction", ex);`
`431`	`431`	`}`