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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/09/06 23:20:52

  Modified:    src/main/org/jboss/seam/mock  BaseSeamTest.java
  Log:
  JBSEAM-1822
  
  Revision  Changes    Path
  1.27      +7 -0      jboss-seam/src/main/org/jboss/seam/mock/BaseSeamTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BaseSeamTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/BaseSeamTest.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- BaseSeamTest.java	13 Aug 2007 18:03:11 -0000	1.26
  +++ BaseSeamTest.java	7 Sep 2007 03:20:52 -0000	1.27
  @@ -53,6 +53,7 @@
   import org.jboss.seam.transaction.Transaction;
   import org.jboss.seam.util.Naming;
   import org.jboss.seam.util.Reflections;
  +import org.jboss.seam.web.Session;
   
   /**
    * Base class for integration tests for JSF/Seam applications.  This class can be
  @@ -525,6 +526,12 @@
            {
               if (Contexts.isEventContextActive())
               {
  +               // If there is still an active transaction, roll it back
  +               if (!Transaction.instance().isNoTransaction())
  +               {
  +                  Transaction.instance().rollback();
  +               }
  +               
                  FacesLifecycle.endRequest(externalContext);
               }
            }