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

[Gavin King]

  User: gavin   
  Date: 06/12/15 01:01:15

  Modified:    src/main/org/jboss/seam/contexts   EntityBean.java
                        PassivatedEntity.java
  Log:
  better handling when tx rolls back
  
  Revision  Changes    Path
  1.4       +6 -3      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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- EntityBean.java	13 Dec 2006 10:09:12 -0000	1.3
  +++ EntityBean.java	15 Dec 2006 06:01:15 -0000	1.4
  @@ -29,11 +29,14 @@
      {
         if (passivatedEntity==null)
         {
  +         if ( !PassivatedEntity.isTransactionMarkedRollback() )
  +         {
            passivatedEntity = PassivatedEntity.createPassivatedEntity(instance, null);
            if (passivatedEntity!=null)
            {
               instance = null;
            }
  +         }
            return true;
         }
         else
  
  
  
  1.3       +13 -0     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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- PassivatedEntity.java	15 Dec 2006 05:45:36 -0000	1.2
  +++ PassivatedEntity.java	15 Dec 2006 06:01:15 -0000	1.3
  @@ -12,6 +12,7 @@
   import org.jboss.seam.Seam;
   import org.jboss.seam.core.PersistenceContexts;
   import org.jboss.seam.persistence.PersistenceProvider;
  +import org.jboss.seam.util.Transactions;
   
   public class PassivatedEntity implements Serializable
   {
  @@ -128,4 +129,16 @@
         return null;
      }
      
  +   public static boolean isTransactionMarkedRollback()
  +   {
  +      try
  +      {
  +         return Transactions.isTransactionMarkedRollback();
  +      }
  +      catch (Exception e)
  +      {
  +         return false;
  +      }
  +   }
  +   
   }
  \ No newline at end of file