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

[Jimmy Wilson]

  User: jawilson
  Date: 07/06/24 17:11:50

  Modified:    src/org/jboss/cache/interceptors   Tag:
                        Branch_JBossCache_1_4_0 CacheStoreInterceptor.java
                        CacheLoaderInterceptor.java
  Log:
  Fix for [JBCACHE-1103] (backport).  Removed empty finally blocks created by the removal of  releaseLoaderLock(...).
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.26.2.4  +1 -21     JBossCache/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheStoreInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java,v
  retrieving revision 1.26.2.3
  retrieving revision 1.26.2.4
  diff -u -b -r1.26.2.3 -r1.26.2.4
  --- CacheStoreInterceptor.java	24 Jun 2007 21:09:40 -0000	1.26.2.3
  +++ CacheStoreInterceptor.java	24 Jun 2007 21:11:50 -0000	1.26.2.4
  @@ -26,7 +26,7 @@
    * Writes modifications back to the store on the way out: stores modifications back
    * through the CacheLoader, either after each method call (no TXs), or at TX commit.
    * @author Bela Ban
  - * @version $Id: CacheStoreInterceptor.java,v 1.26.2.3 2007/06/24 21:09:40 jawilson Exp $
  + * @version $Id: CacheStoreInterceptor.java,v 1.26.2.4 2007/06/24 21:11:50 jawilson Exp $
    */
   public class CacheStoreInterceptor extends Interceptor implements CacheStoreInterceptorMBean
   {
  @@ -149,10 +149,6 @@
                {
                   loader.remove(fqn);
                }
  -             finally
  -             {
  -                //releaseLoaderLock(fqn);
  -             }
                break;
             case MethodDeclarations.removeKeyMethodLocal_id:
                fqn=(Fqn)args[1];
  @@ -162,10 +158,6 @@
                   tmp_retval=loader.remove(fqn, key);
                   use_tmp_retval=true;
                }
  -             finally
  -             {
  -                //releaseLoaderLock(fqn);
  -             }
                break;
             case MethodDeclarations.removeDataMethodLocal_id:
                fqn=(Fqn)args[1];
  @@ -173,10 +165,6 @@
                {
                    loader.removeData(fqn);
                }
  -             finally
  -             {
  -                 //releaseLoaderLock(fqn);
  -             }
                break;
          }
   //      }
  @@ -197,10 +185,6 @@
               {
                   loader.put(Collections.singletonList(mod));
               }
  -            finally
  -            {
  -                //releaseLoaderLock(fqn);
  -            }
               if (cache.getUseInterceptorMbeans()&& statsEnabled)
                  m_cacheStores++;
               break;
  @@ -213,10 +197,6 @@
                    tmp_retval = loader.put(fqn, key, value);
                    use_tmp_retval = true;
                }
  -             finally
  -             {
  -                 //releaseLoaderLock(fqn);
  -             }
                if (cache.getUseInterceptorMbeans()&& statsEnabled)
                   m_cacheStores++;
               break;
  
  
  
  1.40.2.6  +1 -5      JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLoaderInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java,v
  retrieving revision 1.40.2.5
  retrieving revision 1.40.2.6
  diff -u -b -r1.40.2.5 -r1.40.2.6
  --- CacheLoaderInterceptor.java	24 Jun 2007 21:09:40 -0000	1.40.2.5
  +++ CacheLoaderInterceptor.java	24 Jun 2007 21:11:50 -0000	1.40.2.6
  @@ -29,7 +29,7 @@
    * Loads nodes that don't exist at the time of the call into memory from the CacheLoader
    *
    * @author Bela Ban
  - * @version $Id: CacheLoaderInterceptor.java,v 1.40.2.5 2007/06/24 21:09:40 jawilson Exp $
  + * @version $Id: CacheLoaderInterceptor.java,v 1.40.2.6 2007/06/24 21:11:50 jawilson Exp $
    */
   public class CacheLoaderInterceptor extends Interceptor implements CacheLoaderInterceptorMBean
   {
  @@ -203,10 +203,6 @@
   
   
            }
  -         finally
  -         {
  -            //releaseLoaderLock(fqn);
  -         }
   
         }