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

[Gavin King]

  User: gavin   
  Date: 07/06/13 11:21:07

  Modified:    src/main/org/jboss/seam/contexts   EntityBean.java
                        PassivatedEntity.java
  Log:
  work around lame handling of tx timeouts in 4.2
  
  Revision  Changes    Path
  1.6       +1 -1      jboss-seam/src/main/org/jboss/seam/contexts/EntityBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/EntityBean.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- EntityBean.java	21 Dec 2006 02:38:25 -0000	1.5
  +++ EntityBean.java	13 Jun 2007 15:21:07 -0000	1.6
  @@ -26,7 +26,7 @@
      {
         if (passivatedEntity==null)
         {
  -         if ( !PassivatedEntity.isTransactionMarkedRollback() )
  +         if ( !PassivatedEntity.isTransactionRolledBackOrMarkedRollback() )
            {
               passivatedEntity = PassivatedEntity.createPassivatedEntity(instance, null);
               if (passivatedEntity!=null)
  
  
  
  1.8       +2 -2      jboss-seam/src/main/org/jboss/seam/contexts/PassivatedEntity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PassivatedEntity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/PassivatedEntity.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- PassivatedEntity.java	30 May 2007 20:15:59 -0000	1.7
  +++ PassivatedEntity.java	13 Jun 2007 15:21:07 -0000	1.8
  @@ -129,11 +129,11 @@
         return null;
      }
      
  -   public static boolean isTransactionMarkedRollback()
  +   public static boolean isTransactionRolledBackOrMarkedRollback()
      {
         try
         {
  -         return Transaction.instance().isMarkedRollback();
  +         return Transaction.instance().isRolledBackOrMarkedRollback();
         }
         catch (Exception e)
         {