[jboss-cvs] JBossCache/src/org/jboss/cache/interceptors ...

[Manik Surtani]

  User: msurtani
  Date: 07/02/28 13:37:01

  Modified:    src/org/jboss/cache/interceptors   Tag:
                        Branch_JBossCache_1_4_0
                        InvalidationInterceptor.java TxInterceptor.java
  Log:
  JBCACHE-979
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.19.2.1  +4 -1      JBossCache/src/org/jboss/cache/interceptors/InvalidationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InvalidationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/InvalidationInterceptor.java,v
  retrieving revision 1.19
  retrieving revision 1.19.2.1
  diff -u -b -r1.19 -r1.19.2.1
  --- InvalidationInterceptor.java	12 Jun 2006 20:24:31 -0000	1.19
  +++ InvalidationInterceptor.java	28 Feb 2007 18:37:01 -0000	1.19.2.1
  @@ -112,6 +112,9 @@
                                {
                                    throw new RuntimeException("setting tx rollback failed ", se);
                                }
  +                             if (t instanceof RuntimeException)
  +                                 throw (RuntimeException) t;
  +                             else
                                throw new RuntimeException("Unable to broadcast invalidation messages", t);
                            }
                        }
  
  
  
  1.48.2.13 +18 -3     JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TxInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java,v
  retrieving revision 1.48.2.12
  retrieving revision 1.48.2.13
  diff -u -b -r1.48.2.12 -r1.48.2.13
  --- TxInterceptor.java	30 Jan 2007 18:14:09 -0000	1.48.2.12
  +++ TxInterceptor.java	28 Feb 2007 18:37:01 -0000	1.48.2.13
  @@ -571,6 +571,9 @@
   
                   if (retval != null && retval instanceof Exception)
                   {
  +                    if (retval instanceof RuntimeException)
  +                        throw (RuntimeException) retval;
  +                    else
                       throw new RuntimeException((Exception) retval);
                   }
               }
  @@ -764,11 +767,20 @@
               {
                   cleanupStaleLocks(gtx);
               }
  +            catch (RuntimeException re)
  +            {
  +               log.error("Unable to clear stale locks", re);
  +               throw re;
  +            }
               catch (Throwable e2)
               {
                   log.error("Unable to clear stale locks", e2);
                   throw new RuntimeException(e2);
               }
  +
  +            if (e instanceof RuntimeException)
  +               throw (RuntimeException) e;
  +            else
               throw new RuntimeException("Commit failed.", e);
           }
       }
  @@ -1145,6 +1157,9 @@
                   {
                       throw new RuntimeException("setting tx rollback failed ", se);
                   }
  +                if (t instanceof RuntimeException)
  +                  throw (RuntimeException) t;
  +                else
                   throw new RuntimeException("", t);
               }
               finally