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

[Gavin King]

  User: gavin   
  Date: 07/02/25 10:36:37

  Modified:    src/main/org/jboss/seam/framework    Controller.java
                        EntityHome.java Home.java
  Log:
  don't try to load the instance once the tx is rolled back
  
  Revision  Changes    Path
  1.7       +13 -0     jboss-seam/src/main/org/jboss/seam/framework/Controller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Controller.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/Controller.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- Controller.java	14 Feb 2007 05:46:29 -0000	1.6
  +++ Controller.java	25 Feb 2007 15:36:37 -0000	1.7
  @@ -25,6 +25,7 @@
   import org.jboss.seam.core.Validation;
   import org.jboss.seam.log.Log;
   import org.jboss.seam.security.Identity;
  +import org.jboss.seam.util.Transactions;
   
   /**
    * Base class for controller objects. Provides various
  @@ -267,4 +268,16 @@
         Seam.invalidateSession();
      }
   
  +   protected boolean isTransactionMarkedRollback()
  +   {
  +      try
  +      {
  +         return Transactions.isTransactionMarkedRollback();
  +      }
  +      catch (Exception e)
  +      {
  +         return false;
  +      }
  +   }
  +
   }
  
  
  
  1.17      +1 -1      jboss-seam/src/main/org/jboss/seam/framework/EntityHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/EntityHome.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  
  
  
  1.18      +7 -4      jboss-seam/src/main/org/jboss/seam/framework/Home.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Home.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/Home.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- Home.java	12 Feb 2007 16:47:29 -0000	1.17
  +++ Home.java	25 Feb 2007 15:36:37 -0000	1.18
  @@ -76,11 +76,14 @@
      {
         if ( isIdDefined() )
         {
  +         if ( !isTransactionMarkedRollback() )
  +         {
            //we cache the instance so that it does not "disappear"
            //after remove() is called on the instance
            //is this really a Good Idea??
            setInstance( find() );
         }
  +      }
         else
         {
            setInstance( createInstance() );