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

HHH-7539 - Interceptor.afterTransactionCompletion not called when transaction completes via JTA sync

This commit is contained in:
Steve Ebersole 2013-10-31 07:51:23 -05:00
parent 560b274fb7
commit bdf0186a7f
5 changed files with 188 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
View File

@ -137,7 +137,7 @@ public class TransactionCoordinatorImpl implements TransactionCoordinator {
final boolean success = JtaStatusHelper.isCommitted( status );
if (sessionFactory().getStatistics().isStatisticsEnabled()) {
if ( sessionFactory().getStatistics().isStatisticsEnabled() ) {
transactionEnvironment.getStatisticsImplementor().endTransaction( success );
}

17
hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/internal/RegisteredSynchronization.java
View File

@ -28,7 +28,7 @@ import javax.transaction.Synchronization;
import org.jboss.logging.Logger;
import org.hibernate.engine.transaction.synchronization.spi.SynchronizationCallbackCoordinator;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.CoreLogging;
/**
* The JTA {@link javax.transaction.Synchronization} Hibernate registers when needed for JTA callbacks
@ -36,8 +36,7 @@ import org.hibernate.internal.CoreMessageLogger;
* @author Steve Ebersole
*/
public class RegisteredSynchronization implements Synchronization {
private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, RegisteredSynchronization.class.getName() );
private static final Logger log = CoreLogging.logger( RegisteredSynchronization.class.getName() );
private final SynchronizationCallbackCoordinator synchronizationCallbackCoordinator;
@ -45,19 +44,15 @@ public class RegisteredSynchronization implements Synchronization {
this.synchronizationCallbackCoordinator = synchronizationCallbackCoordinator;
}
/**
* {@inheritDoc}
*/
@Override
public void beforeCompletion() {
LOG.trace( "JTA sync : beforeCompletion()" );
log.trace( "JTA sync : beforeCompletion()" );
synchronizationCallbackCoordinator.beforeCompletion();
}
/**
* {@inheritDoc}
*/
@Override
public void afterCompletion(int status) {
LOG.tracef( "JTA sync : afterCompletion(%s)", status );
log.tracef( "JTA sync : afterCompletion(%s)", status );
synchronizationCallbackCoordinator.afterCompletion( status );
}
}

2
hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/internal/SynchronizationCallbackCoordinatorImpl.java
View File

@ -163,7 +163,7 @@ public class SynchronizationCallbackCoordinatorImpl implements SynchronizationCa
}
private void doAfterCompletion(int status) {
LOG.tracev( "Transaction afterCompletion callback [status={0}]", status );
LOG.tracef( "Starting transaction afterCompletion callback [status=%s]", status );
if ( !transactionCoordinator.isActive() ) {
return;
}

14
hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View File

@ -632,14 +632,14 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
LOG.trace( "after transaction completion" );
persistenceContext.afterTransactionCompletion();
actionQueue.afterTransactionCompletion( successful );
if ( hibernateTransaction != null ) {
try {
interceptor.afterTransactionCompletion( hibernateTransaction );
}
catch (Throwable t) {
LOG.exceptionInAfterTransactionCompletionInterceptor( t );
}
try {
interceptor.afterTransactionCompletion( hibernateTransaction );
}
catch (Throwable t) {
LOG.exceptionInAfterTransactionCompletionInterceptor( t );
}
if ( autoClear ) {
internalClear();
}

173
hibernate-core/src/test/java/org/hibernate/test/transaction/jta/InterceptorCallbackTests.java Normal file
View File

@ -0,0 +1,173 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2013, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.test.transaction.jta;
import javax.transaction.NotSupportedException;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
import org.hibernate.EmptyInterceptor;
import org.hibernate.Interceptor;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
import org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.junit.Test;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
/**
* @author Steve Ebersole
*/
public class InterceptorCallbackTests extends BaseUnitTestCase {
@Test
public void testManagedTransactionCallbacks() {
SessionFactory sf = new Configuration()
.setProperty( AvailableSettings.TRANSACTION_STRATEGY, JtaTransactionFactory.SHORT_NAME )
.buildSessionFactory();
JournalingInterceptor interceptor = new JournalingInterceptor();
try {
Session session = sf.withOptions().interceptor( interceptor ).openSession();
session.beginTransaction();
session.getTransaction().commit();
session.close();
}
finally {
sf.close();
}
assertEquals( 1, interceptor.afterStart );
assertEquals( 1, interceptor.beforeCompletion );
assertEquals( 1, interceptor.afterCompletion );
}
@Test
public void testTransactionCallbacks() throws Exception {
SessionFactoryImplementor sf = (SessionFactoryImplementor) new Configuration()
.setProperty( AvailableSettings.TRANSACTION_STRATEGY, JtaTransactionFactory.SHORT_NAME )
.setProperty( AvailableSettings.AUTO_CLOSE_SESSION, "true" )
.buildSessionFactory();
JournalingInterceptor interceptor = new JournalingInterceptor();
try {
JtaPlatform instance = sf.getServiceRegistry().getService( JtaPlatform.class );
TransactionManager transactionManager = instance.retrieveTransactionManager();
// start the cmt
transactionManager.begin();
Session session = sf.withOptions().interceptor( interceptor ).openSession();
transactionManager.commit();
if ( session.isOpen() ) {
try {
session.close();
}
catch (Exception ignore) {
}
fail( "auto-close-session setting did not close session" );
}
}
finally {
sf.close();
}
assertEquals( 0, interceptor.afterStart );
assertEquals( 1, interceptor.beforeCompletion );
assertEquals( 1, interceptor.afterCompletion );
}
@Test
public void testTransactionCallbacks2() throws Exception {
SessionFactoryImplementor sf = (SessionFactoryImplementor) new Configuration()
.setProperty( AvailableSettings.TRANSACTION_STRATEGY, CMTTransactionFactory.SHORT_NAME )
.setProperty( AvailableSettings.AUTO_CLOSE_SESSION, "true" )
.buildSessionFactory();
JournalingInterceptor interceptor = new JournalingInterceptor();
try {
JtaPlatform instance = sf.getServiceRegistry().getService( JtaPlatform.class );
TransactionManager transactionManager = instance.retrieveTransactionManager();
// start the cmt
transactionManager.begin();
Session session = sf.withOptions().interceptor( interceptor ).openSession();
transactionManager.commit();
if ( session.isOpen() ) {
try {
session.close();
}
catch (Exception ignore) {
}
fail( "auto-close-session setting did not close session" );
}
}
finally {
sf.close();
}
assertEquals( 0, interceptor.afterStart );
assertEquals( 1, interceptor.beforeCompletion );
assertEquals( 1, interceptor.afterCompletion );
}
private static class JournalingInterceptor extends EmptyInterceptor implements Interceptor {
int afterStart;
int beforeCompletion;
int afterCompletion;
@Override
public void afterTransactionBegin(Transaction tx) {
afterStart++;
}
@Override
public void afterTransactionCompletion(Transaction tx) {
afterCompletion++;
}
@Override
public void beforeTransactionCompletion(Transaction tx) {
beforeCompletion++;
}
}
}