very minor code changes

This commit is contained in:
Gavin King 2024-12-16 10:15:14 +01:00
parent 05cf85b61a
commit f7e3177dba
1 changed files with 28 additions and 31 deletions

View File

@ -461,37 +461,35 @@ public abstract class AbstractSharedSessionContract implements SharedSessionCont
@Override
public void close() {
if ( closed && !waitingForAutoClose ) {
return;
}
try {
delayedAfterCompletion();
}
catch ( HibernateException e ) {
if ( getFactory().getSessionFactoryOptions().isJpaBootstrap() ) {
throw getExceptionConverter().convert( e );
if ( !closed || waitingForAutoClose ) {
try {
delayedAfterCompletion();
}
else {
throw e;
catch ( HibernateException e ) {
if ( getFactory().getSessionFactoryOptions().isJpaBootstrap() ) {
throw getExceptionConverter().convert( e );
}
else {
throw e;
}
}
}
if ( sessionEventsManager != null ) {
sessionEventsManager.end();
}
if ( transactionCoordinator != null ) {
removeSharedSessionTransactionObserver( transactionCoordinator );
}
try {
if ( shouldCloseJdbcCoordinatorOnClose( isTransactionCoordinatorShared ) ) {
jdbcCoordinator.close();
if ( sessionEventsManager != null ) {
sessionEventsManager.end();
}
if ( transactionCoordinator != null ) {
removeSharedSessionTransactionObserver( transactionCoordinator );
}
try {
if ( shouldCloseJdbcCoordinatorOnClose( isTransactionCoordinatorShared ) ) {
jdbcCoordinator.close();
}
}
finally {
setClosed();
}
}
finally {
setClosed();
}
}
@ -553,10 +551,9 @@ public abstract class AbstractSharedSessionContract implements SharedSessionCont
@Override
public boolean isTransactionInProgress() {
if ( waitingForAutoClose ) {
return factory.isOpen() && transactionCoordinator.isTransactionActive();
}
return !isClosed() && transactionCoordinator.isTransactionActive();
return waitingForAutoClose
? factory.isOpen() && transactionCoordinator.isTransactionActive()
: !isClosed() && transactionCoordinator.isTransactionActive();
}
@Override