From 74dc61b8c4010ad5a96b8a0bf8cbeb7bbc4e39a7 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 2 Oct 2025 13:01:03 +0200 Subject: [PATCH 1/2] Fall back to local synchronization in getObjectFromFactoryBean Closes gh-35545 --- .../factory/support/FactoryBeanRegistrySupport.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java index 0883637d23b..b30081b8941 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java @@ -130,7 +130,17 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg try { Object object = this.factoryBeanObjectCache.get(beanName); if (object == null) { - object = doGetObjectFromFactoryBean(factory, beanName); + if (locked) { + // The common case: within general singleton lock. + object = doGetObjectFromFactoryBean(factory, beanName); + } + else { + // Fall back to local synchronization on the given FactoryBean instance, + // as a defensive measure for non-thread-safe FactoryBean implementations. + synchronized (factory) { + object = doGetObjectFromFactoryBean(factory, beanName); + } + } // Only post-process and store if not put there already during getObject() call above // (for example, because of circular reference processing triggered by custom getBean calls) Object alreadyThere = this.factoryBeanObjectCache.get(beanName); From d484e4f3ff1d33c60cec923edc7ad1b890275379 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 2 Oct 2025 13:01:30 +0200 Subject: [PATCH 2/2] Ignore SQL state 3B001 in releaseSavepoint (for HSQLDB) Closes gh-35564 --- .../jdbc/datasource/JdbcTransactionObjectSupport.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java index 3ce600ebf7f..b8e1064919f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java @@ -184,6 +184,10 @@ public abstract class JdbcTransactionObjectSupport implements SavepointManager, // typically on Oracle - ignore } catch (SQLException ex) { + if ("3B001".equals(ex.getSQLState())) { + // Savepoint already released (HSQLDB, PostgreSQL, DB2) - ignore + return; + } // ignore Microsoft SQLServerException: This operation is not supported. String msg = ex.getMessage(); if (msg == null || !msg.contains("not supported")) {