Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-12487 - Calling getTransaction() on a closed EntityManager

This commit is contained in:
Andrea Boriero 2018-04-15 18:57:57 +01:00
parent 19f78bbd3d
commit 291d4a3eea
2 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java
View File

@ -12,6 +12,7 @@ import org.hibernate.HibernateException;
import org.hibernate.TransactionException;
import org.hibernate.engine.spi.ExceptionConverter;
import org.hibernate.engine.transaction.spi.TransactionImplementor;
import org.hibernate.internal.AbstractSharedSessionContract;
import org.hibernate.internal.CoreLogging;
import org.hibernate.jpa.spi.JpaCompliance;
import org.hibernate.resource.transaction.spi.TransactionCoordinator;
@ -31,29 +32,38 @@ public class TransactionImpl implements TransactionImplementor {
private final TransactionCoordinator transactionCoordinator;
private final ExceptionConverter exceptionConverter;
private final JpaCompliance jpaCompliance;
private final AbstractSharedSessionContract session;
private TransactionDriver transactionDriverControl;
public TransactionImpl(
TransactionCoordinator transactionCoordinator,
ExceptionConverter exceptionConverter,
JpaCompliance jpaCompliance) {
AbstractSharedSessionContract session) {
this.transactionCoordinator = transactionCoordinator;
this.exceptionConverter = exceptionConverter;
this.jpaCompliance = jpaCompliance;
this.jpaCompliance = session.getFactory().getSessionFactoryOptions().getJpaCompliance();
this.session = session;
this.transactionDriverControl = transactionCoordinator.getTransactionDriverControl();
if ( session.isOpen() && transactionCoordinator.isActive() ) {
this.transactionDriverControl = transactionCoordinator.getTransactionDriverControl();
}
else {
LOG.debug( "TransactionImpl created on closed Session/EntityManager" );
}
LOG.debugf(
"On TransactionImpl creation, JpaCompliance#isJpaTransactionComplianceEnabled == %s",
jpaCompliance.isJpaTransactionComplianceEnabled()
);
if ( LOG.isDebugEnabled() ) {
LOG.debugf(
"On TransactionImpl creation, JpaCompliance#isJpaTransactionComplianceEnabled == %s",
jpaCompliance.isJpaTransactionComplianceEnabled()
);
}
}
@Override
public void begin() {
if ( !transactionCoordinator.isActive() ) {
throw new TransactionException( "Cannot begin Transaction on closed Session/EntityManager" );
if ( !session.isOpen() ) {
throw new IllegalStateException( "Cannot begin Transaction on closed Session/EntityManager" );
}
if ( transactionDriverControl == null ) {
@ -66,6 +76,7 @@ public class TransactionImpl implements TransactionImplementor {
}
LOG.debug( "begin" );
this.transactionDriverControl.begin();
}
@ -82,6 +93,7 @@ public class TransactionImpl implements TransactionImplementor {
}
LOG.debug( "committing" );
try {
internalGetTransactionDriverControl().commit();
}
@ -100,8 +112,9 @@ public class TransactionImpl implements TransactionImplementor {
@Override
public void rollback() {
if ( jpaCompliance.isJpaTransactionComplianceEnabled() ) {
if ( !isActive() ) {
if ( !isActive() ) {
if ( jpaCompliance.isJpaTransactionComplianceEnabled() ) {
throw new IllegalStateException(
"JPA compliance dictates throwing IllegalStateException when #rollback " +
"is called on non-active transaction"
@ -121,6 +134,7 @@ public class TransactionImpl implements TransactionImplementor {
}
LOG.debug( "rolling back" );
if ( status != TransactionStatus.FAILED_COMMIT || allowFailedCommitToPhysicallyRollback() ) {
internalGetTransactionDriverControl().rollback();
}
@ -136,7 +150,12 @@ public class TransactionImpl implements TransactionImplementor {
@Override
public boolean isActive(boolean isMarkedForRollbackConsideredActive) {
if ( transactionDriverControl == null ) {
transactionDriverControl = transactionCoordinator.getTransactionDriverControl();
if ( session.isOpen() ) {
transactionDriverControl = transactionCoordinator.getTransactionDriverControl();
}
else {
return false;
}
}
return transactionDriverControl.isActive( isMarkedForRollbackConsideredActive );
}
@ -144,7 +163,12 @@ public class TransactionImpl implements TransactionImplementor {
@Override
public TransactionStatus getStatus() {
if ( transactionDriverControl == null ) {
transactionDriverControl = transactionCoordinator.getTransactionDriverControl();
if ( session.isOpen() ) {
transactionDriverControl = transactionCoordinator.getTransactionDriverControl();
}
else {
return TransactionStatus.NOT_ACTIVE;
}
}
return transactionDriverControl.getStatus();
}
@ -175,25 +199,29 @@ public class TransactionImpl implements TransactionImplementor {
@Override
public void setRollbackOnly() {
// Since this is the JPA-defined one, we make sure the txn is active first
// so long as compliance (JpaCompliance) has not been defined to disable
// that check - making this active more like Hibernate's #markRollbackOnly
if ( jpaCompliance.isJpaTransactionComplianceEnabled() ) {
if ( !isActive() ) {
if ( !isActive() ) {
// Since this is the JPA-defined one, we make sure the txn is active first
// so long as compliance (JpaCompliance) has not been defined to disable
// that check - making this active more like Hibernate's #markRollbackOnly
if ( jpaCompliance.isJpaTransactionComplianceEnabled() ) {
throw new IllegalStateException(
"JPA compliance dictates throwing IllegalStateException when #setRollbackOnly " +
"is called on non-active transaction"
);
}
else {
LOG.debug( "#setRollbackOnly called on a not-active transaction" );
}
}
else {
markRollbackOnly();
}
markRollbackOnly();
}
@Override
public boolean getRollbackOnly() {
if ( jpaCompliance.isJpaTransactionComplianceEnabled() ) {
if ( !isActive() ) {
if ( !isActive() ) {
if ( jpaCompliance.isJpaTransactionComplianceEnabled() ) {
throw new IllegalStateException(
"JPA compliance dictates throwing IllegalStateException when #getRollbackOnly " +
"is called on non-active transaction"

6
hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
View File

@ -80,7 +80,6 @@ import org.hibernate.resource.jdbc.spi.StatementInspector;
import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;
import org.hibernate.resource.transaction.spi.TransactionCoordinator;
import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
import org.hibernate.resource.transaction.spi.TransactionStatus;
import org.hibernate.type.Type;
import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
@ -404,13 +403,12 @@ public abstract class AbstractSharedSessionContract implements SharedSessionCont
@Override
public Transaction accessTransaction() {
if ( this.currentHibernateTransaction == null || this.currentHibernateTransaction.getStatus() != TransactionStatus.ACTIVE ) {
if ( this.currentHibernateTransaction == null ) {
this.currentHibernateTransaction = new TransactionImpl(
getTransactionCoordinator(),
getExceptionConverter(),
getFactory().getSessionFactoryOptions().getJpaCompliance()
this
);
}
if ( !isClosed() || (waitingForAutoClose && factory.isOpen()) ) {
getTransactionCoordinator().pulse();