Skip to content

fix: share one connection between Hibernate and JDBC DHIS2-22067 [42] #25071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
teleivo merged 1 commit into from
Sep 9, 2026
Merged

fix: share one connection between Hibernate and JDBC DHIS2-22067 [42] #25071

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...is-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/config/HibernateConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,16 @@ public static PersistenceExceptionTranslationPostProcessor exceptionTranslation(
}

@Bean
public JpaTransactionManager jpaTransactionManager(EntityManagerFactory entityManagerFactory) {
return new JpaTransactionManager(entityManagerFactory);
public JpaTransactionManager jpaTransactionManager(
EntityManagerFactory entityManagerFactory,
@Qualifier("actualDataSource") DataSource dataSource) {
JpaTransactionManager transactionManager = new JpaTransactionManager(entityManagerFactory);
// Must be the same bean instance the JdbcTemplates get. Spring keys transactional connections
// by DataSource identity, so without this a @Transactional method mixing Hibernate and
// JdbcTemplate takes a second connection which is not enlisted in the transaction: its
// statements commit immediately and a rollback does not cover them.
transactionManager.setDataSource(dataSource);
return transactionManager;
}

@Bean
Expand Down
Loading