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

[Manik Surtani]

  User: msurtani
  Date: 07/05/25 12:34:51

  Modified:    src/org/jboss/cache  CacheImpl.java
  Log:
  Fixed some pretty nasty BR issues
  
  Revision  Changes    Path
  1.78      +23 -21    JBossCache/src/org/jboss/cache/CacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -b -r1.77 -r1.78
  --- CacheImpl.java	23 May 2007 19:33:44 -0000	1.77
  +++ CacheImpl.java	25 May 2007 16:34:51 -0000	1.78
  @@ -869,7 +869,6 @@
   
      /**
       * The actual destroy implementation.
  -    * 
       */
      private void internalDestroy()
      {
  @@ -931,7 +930,6 @@
   
      /**
       * The actual stop implementation.
  -    * 
       */
      private void internalStop()
      {
  @@ -3829,9 +3827,11 @@
      {
         // don't create a new one; get it from ThreadLocal just this once, in case a user has added any overrides.
         InvocationContext ctx = getInvocationContext();
  -
  +      MethodCall oldCall = null;
         try
         {
  +         // check if we had a method call lurking around
  +         oldCall = ctx.getMethodCall();
            ctx.setMethodCall(m);
            // only set this if originLocal is EXPLICITLY passed in as FALSE.  Otherwise leave it as a default.
            if (!originLocal) ctx.setOriginLocal(false);
  @@ -3852,6 +3852,8 @@
         finally
         {
            if (!originLocal) ctx.setOriginLocal(true);
  +         // reset old method call
  +         ctx.setMethodCall(oldCall);
         }
      }