[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejbEnterpriseContext.java

[jBoss CVS Development]

  User: osh     
  Date: 00/10/08 01:04:00

  Modified:    src/main/org/jboss/ejb EnterpriseContext.java
  Log:
  Catch IllegalStateException from setRollbackOnly() to avoid race with tx timeout.
  
  Revision  Changes    Path
  1.16      +8 -9      jboss/src/main/org/jboss/ejb/EnterpriseContext.java
  
  Index: EnterpriseContext.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EnterpriseContext.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- EnterpriseContext.java    2000/10/03 02:34:53     1.15
  +++ EnterpriseContext.java    2000/10/08 08:04:00     1.16
  @@ -36,7 +36,7 @@
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.15 $
  + *   @version $Revision: 1.16 $
    */
   public abstract class EnterpriseContext
   {
  @@ -218,15 +218,14 @@
         }
          
         public void setRollbackOnly() 
  -       { 
  -         try
  -         {
  -          con.getTransactionManager().setRollbackOnly();
  -         } catch (SystemException e)
  -         {
  -          Logger.debug(e);
  +      { 
  +         try {
  +            con.getTransactionManager().setRollbackOnly();
  +         } catch (IllegalStateException e) {
  +         } catch (SystemException e) {
  +            Logger.debug(e);
            }
  -       }
  +      }
      
         /**
          *