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

[Gavin King]

  User: gavin   
  Date: 07/06/23 03:38:07

  Modified:    src/main/org/jboss/seam/transaction   
                        EntityTransaction.java HibernateTransaction.java
                        UserTransaction.java
  Log:
  smt with ht or et requires conversation context
  
  Revision  Changes    Path
  1.3       +8 -2      jboss-seam/src/main/org/jboss/seam/transaction/EntityTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/transaction/EntityTransaction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EntityTransaction.java	23 Jun 2007 07:11:45 -0000	1.2
  +++ EntityTransaction.java	23 Jun 2007 07:38:07 -0000	1.3
  @@ -41,7 +41,7 @@
         if (currentEntityManager==null)
         {
            //should never occur
  -         throw new IllegalStateException("session is null");
  +         throw new IllegalStateException("entity manager is null");
         }
         return currentEntityManager.getTransaction();
      }
  @@ -51,7 +51,7 @@
         currentEntityManager = entityManager.getValue();
         if (currentEntityManager==null)
         {
  -         throw new IllegalStateException("session was null: " + entityManager.getExpressionString());
  +         throw new IllegalStateException("entity manager was null: " + entityManager.getExpressionString());
         }
      }
   
  @@ -161,6 +161,12 @@
         }
      }
   
  +   @Override
  +   public boolean isConversationContextRequired()
  +   {
  +      return true;
  +   }
  +
      public ValueExpression<EntityManager> getEntityManager()
      {
         return entityManager;
  
  
  
  1.3       +6 -0      jboss-seam/src/main/org/jboss/seam/transaction/HibernateTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HibernateTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/transaction/HibernateTransaction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- HibernateTransaction.java	23 Jun 2007 07:11:45 -0000	1.2
  +++ HibernateTransaction.java	23 Jun 2007 07:38:07 -0000	1.3
  @@ -162,6 +162,12 @@
         }
      }
   
  +   @Override
  +   public boolean isConversationContextRequired()
  +   {
  +      return true;
  +   }
  +
      public ValueExpression<Session> getSession()
      {
         return session;
  
  
  
  1.4       +5 -0      jboss-seam/src/main/org/jboss/seam/transaction/UserTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UserTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/transaction/UserTransaction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- UserTransaction.java	13 Jun 2007 15:21:08 -0000	1.3
  +++ UserTransaction.java	23 Jun 2007 07:38:07 -0000	1.4
  @@ -55,4 +55,9 @@
         return getStatus() == STATUS_COMMITTED;
      }
   
  +   public boolean isConversationContextRequired()
  +   {
  +      return false;
  +   }
  +
   }