Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2025-04-05 16:14:06 +02:00
parent eee45c3583 cc5ae23915
commit 8d48a1e34b
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -77,6 +77,9 @@ import org.springframework.util.Assert;
* You will get the same effect with non-transactional reads, but lazy fetching * You will get the same effect with non-transactional reads, but lazy fetching
* of JDBC Connections allows you to still perform reads in transactions. * of JDBC Connections allows you to still perform reads in transactions.
* *
* <p>As of 6.2.6, this DataSource proxy also suppresses a rollback attempt
* in case of a timeout where the connection has been closed in the meantime.
*
* <p><b>NOTE:</b> This DataSource proxy needs to return wrapped Connections * <p><b>NOTE:</b> This DataSource proxy needs to return wrapped Connections
* (which implement the {@link ConnectionProxy} interface) in order to handle * (which implement the {@link ConnectionProxy} interface) in order to handle
* lazy fetching of an actual JDBC Connection. Use {@link Connection#unwrap} * lazy fetching of an actual JDBC Connection. Use {@link Connection#unwrap}
@@ -425,11 +428,19 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource {
return null; return null;
} }
// Target Connection already fetched,
// or target Connection necessary for current operation -> // Target Connection already fetched, or target Connection necessary for current operation
// invoke method on target connection. // -> invoke method on target connection.
try { try {
return method.invoke(getTargetConnection(method), args); Connection conToUse = getTargetConnection(method);
if ("rollback".equals(method.getName()) && conToUse.isClosed()) {
// Connection closed in the meantime, probably due to a resource timeout. Since a
// rollback attempt typically happens right before close, we leniently suppress it.
return null;
}
return method.invoke(conToUse, args);
} }
catch (InvocationTargetException ex) { catch (InvocationTargetException ex) {
throw ex.getTargetException(); throw ex.getTargetException();