[jboss-cvs] jboss-seam/src/main/org/jboss/seam/persistence ...
Gavin King
gavin.king at jboss.com
Sun Jun 24 02:34:34 EDT 2007
User: gavin
Date: 07/06/24 02:34:34
Modified: src/main/org/jboss/seam/persistence
ManagedHibernateSession.java
ManagedPersistenceContext.java
Log:
got rid of TransactionListener, merged with the Transaction package, for more consistent behavior across diff types of tx management
Revision Changes Path
1.10 +6 -7 jboss-seam/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ManagedHibernateSession.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ManagedHibernateSession.java 22 Jun 2007 15:28:57 -0000 1.9
+++ ManagedHibernateSession.java 24 Jun 2007 06:34:33 -0000 1.10
@@ -1,4 +1,4 @@
-//$Id: ManagedHibernateSession.java,v 1.9 2007/06/22 15:28:57 gavin Exp $
+//$Id: ManagedHibernateSession.java,v 1.10 2007/06/24 06:34:33 gavin Exp $
package org.jboss.seam.persistence;
import java.io.Serializable;
@@ -24,13 +24,12 @@
import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
-import org.jboss.seam.core.BasicTransactionListener;
import org.jboss.seam.core.Mutable;
-import org.jboss.seam.core.TransactionListener;
import org.jboss.seam.core.Expressions.ValueExpression;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.transaction.Transaction;
+import org.jboss.seam.transaction.UserTransaction;
import org.jboss.seam.util.Naming;
/**
@@ -115,12 +114,12 @@
if ( !synchronizationRegistered && !Lifecycle.isDestroying() && Transaction.instance().isActive() )
{
session.isOpen();
- TransactionListener transactionListener = BasicTransactionListener.instance();
- if (transactionListener!=null)
+ UserTransaction transaction = Transaction.instance();
+ try
{
- transactionListener.registerSynchronization(this);
+ transaction.registerSynchronization(this);
}
- else
+ catch (UnsupportedOperationException uoe)
{
session.getTransaction().registerSynchronization(this);
}
1.7 +6 -7 jboss-seam/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ManagedPersistenceContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ManagedPersistenceContext.java 22 Jun 2007 15:28:57 -0000 1.6
+++ ManagedPersistenceContext.java 24 Jun 2007 06:34:34 -0000 1.7
@@ -1,4 +1,4 @@
-//$Id: ManagedPersistenceContext.java,v 1.6 2007/06/22 15:28:57 gavin Exp $
+//$Id: ManagedPersistenceContext.java,v 1.7 2007/06/24 06:34:34 gavin Exp $
package org.jboss.seam.persistence;
import java.io.Serializable;
@@ -24,13 +24,12 @@
import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
-import org.jboss.seam.core.TransactionListener;
import org.jboss.seam.core.Mutable;
-import org.jboss.seam.core.BasicTransactionListener;
import org.jboss.seam.core.Expressions.ValueExpression;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.transaction.Transaction;
+import org.jboss.seam.transaction.UserTransaction;
import org.jboss.seam.util.Naming;
/**
@@ -110,13 +109,13 @@
if ( !synchronizationRegistered && !Lifecycle.isDestroying() && Transaction.instance().isActive() )
{
entityManager.joinTransaction();
- TransactionListener transactionListener = BasicTransactionListener.instance();
- if (transactionListener!=null)
+ UserTransaction transaction = Transaction.instance();
+ try
{
- transactionListener.registerSynchronization(this);
+ transaction.registerSynchronization(this);
synchronizationRegistered = true;
}
- else
+ catch (UnsupportedOperationException uoe)
{
synchronizationRegistered = PersistenceProvider.instance().registerSynchronization(this, entityManager);
}
More information about the jboss-cvs-commits
mailing list