[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Gavin King]

  User: gavin   
  Date: 07/06/17 23:28:53

  Modified:    src/main/org/jboss/seam/core    ManagedHibernateSession.java
                        ManagedJbpmContext.java
                        ManagedPersistenceContext.java
  Log:
  improvements
  
  Revision  Changes    Path
  1.37      +7 -3      jboss-seam/src/main/org/jboss/seam/core/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/core/ManagedHibernateSession.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- ManagedHibernateSession.java	18 Jun 2007 03:21:33 -0000	1.36
  +++ ManagedHibernateSession.java	18 Jun 2007 03:28:53 -0000	1.37
  @@ -1,4 +1,4 @@
  -//$Id: ManagedHibernateSession.java,v 1.36 2007/06/18 03:21:33 gavin Exp $
  +//$Id: ManagedHibernateSession.java,v 1.37 2007/06/18 03:28:53 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -114,13 +114,17 @@
         //join the transaction
         if ( !synchronizationRegistered && !Lifecycle.isDestroying() && Transaction.instance().isActive() )
         {
  +         session.isOpen();
            LocalTransactionListener transactionListener = TransactionListener.instance();
            if (transactionListener!=null)
            {
               transactionListener.registerSynchronization(this);
  -            synchronizationRegistered = true;
            }
  -         session.isOpen();
  +         else
  +         {
  +            session.getTransaction().registerSynchronization(this);
  +         }
  +         synchronizationRegistered = true;
         }
         
         return session;
  
  
  
  1.29      +10 -1     jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- ManagedJbpmContext.java	18 Jun 2007 03:21:33 -0000	1.28
  +++ ManagedJbpmContext.java	18 Jun 2007 03:28:53 -0000	1.29
  @@ -76,7 +76,16 @@
         }
         if ( !synchronizationRegistered && !Lifecycle.isDestroying() && Transaction.instance().isActive() )
         {
  +         jbpmContext.getSession().isOpen();
  +         LocalTransactionListener transactionListener = TransactionListener.instance();
  +         if (transactionListener!=null)
  +         {
  +            transactionListener.registerSynchronization(this);
  +         }
  +         else
  +         {
            jbpmContext.getSession().getTransaction().registerSynchronization(this);
  +         }
            synchronizationRegistered = true;
         }
         return jbpmContext;
  
  
  
  1.46      +2 -2      jboss-seam/src/main/org/jboss/seam/core/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/core/ManagedPersistenceContext.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -b -r1.45 -r1.46
  --- ManagedPersistenceContext.java	18 Jun 2007 03:21:33 -0000	1.45
  +++ ManagedPersistenceContext.java	18 Jun 2007 03:28:53 -0000	1.46
  @@ -1,4 +1,4 @@
  -//$Id: ManagedPersistenceContext.java,v 1.45 2007/06/18 03:21:33 gavin Exp $
  +//$Id: ManagedPersistenceContext.java,v 1.46 2007/06/18 03:28:53 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -110,13 +110,13 @@
         //join the transaction
         if ( !synchronizationRegistered && !Lifecycle.isDestroying() && Transaction.instance().isActive() )
         {
  +         entityManager.joinTransaction();
            LocalTransactionListener transactionListener = TransactionListener.instance();
            if (transactionListener!=null)
            {
               transactionListener.registerSynchronization(this);
               synchronizationRegistered = true;
            }
  -         entityManager.joinTransaction();
         }
         
         return entityManager;