From 7aff57548535cd428f17acb583d24ce455f62f2d Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 30 Oct 2014 22:11:19 +0100 Subject: [PATCH] Reintroduced original SpringSessionSynchronization constructor and made SpringSession/FlushSynchronization public (for GORM) Issue: SPR-12400 --- .../orm/hibernate4/SpringFlushSynchronization.java | 4 ++-- .../orm/hibernate4/SpringSessionSynchronization.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java index 11aa50b6e2..07d8d6981e 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 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. @@ -28,7 +28,7 @@ import org.springframework.transaction.support.TransactionSynchronizationAdapter * @author Juergen Hoeller * @since 3.1 */ -class SpringFlushSynchronization extends TransactionSynchronizationAdapter { +public class SpringFlushSynchronization extends TransactionSynchronizationAdapter { private final Session session; diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java index 91807fde91..b2b86bc2d6 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java @@ -33,7 +33,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager * @author Juergen Hoeller * @since 3.1 */ -class SpringSessionSynchronization implements TransactionSynchronization, Ordered { +public class SpringSessionSynchronization implements TransactionSynchronization, Ordered { private final SessionHolder sessionHolder; @@ -44,12 +44,17 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere private boolean holderActive = true; + public SpringSessionSynchronization(SessionHolder sessionHolder, SessionFactory sessionFactory) { + this(sessionHolder, sessionFactory, false); + } + public SpringSessionSynchronization(SessionHolder sessionHolder, SessionFactory sessionFactory, boolean newSession) { this.sessionHolder = sessionHolder; this.sessionFactory = sessionFactory; this.newSession = newSession; } + private Session getCurrentSession() { return this.sessionHolder.getSession(); } -- GitLab