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

Manik Surtani manik at jboss.org
Wed May 23 06:28:52 EDT 2007


  User: msurtani
  Date: 07/05/23 06:28:52

  Modified:    src/org/jboss/cache/pojo     PojoInstance.java
                        PojoTxSynchronizationHandler.java PojoUtil.java
                        MethodDeclarations.java
  Log:
  Initiated a bunch of performance fixes, including replacing CopyOnWriteArraySets with org.jboss.cache.util.concurrent.ConcurrentHashSet.
  Also ran an imports optimiser on the code base - there were a lot of unused imports floating about.
  
  Revision  Changes    Path
  1.3       +3 -4      JBossCache/src/org/jboss/cache/pojo/PojoInstance.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoInstance.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/PojoInstance.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- PojoInstance.java	16 May 2007 18:29:18 -0000	1.2
  +++ PojoInstance.java	23 May 2007 10:28:52 -0000	1.3
  @@ -10,7 +10,6 @@
   
   import java.io.Serializable;
   import java.util.ArrayList;
  -import java.util.Collection;
   import java.util.Collections;
   import java.util.List;
   
  
  
  
  1.3       +3 -6      JBossCache/src/org/jboss/cache/pojo/PojoTxSynchronizationHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoTxSynchronizationHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/PojoTxSynchronizationHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- PojoTxSynchronizationHandler.java	25 Jan 2007 21:54:05 -0000	1.2
  +++ PojoTxSynchronizationHandler.java	23 May 2007 10:28:52 -0000	1.3
  @@ -9,22 +9,19 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.jboss.aop.InstanceAdvisor;
   import org.jboss.cache.pojo.interceptors.PojoTxUndoSynchronizationInterceptor;
   import org.jboss.cache.pojo.util.MethodCall;
   
   import javax.transaction.Status;
   import javax.transaction.Synchronization;
  -import javax.transaction.Transaction;
  -import java.lang.reflect.Field;
  -import java.util.List;
   import java.util.ArrayList;
  +import java.util.List;
   
   /**
    * Handling the rollback operation for PojoCache level, specifically interceptor add/remove, etc.
    *
    * @author Ben Wang
  - * @version $Id: PojoTxSynchronizationHandler.java,v 1.2 2007/01/25 21:54:05 genman Exp $
  + * @version $Id: PojoTxSynchronizationHandler.java,v 1.3 2007/05/23 10:28:52 msurtani Exp $
    */
   
   public class PojoTxSynchronizationHandler implements Synchronization
  
  
  
  1.4       +8 -8      JBossCache/src/org/jboss/cache/pojo/PojoUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/PojoUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- PojoUtil.java	23 Apr 2007 02:53:22 -0000	1.3
  +++ PojoUtil.java	23 May 2007 10:28:52 -0000	1.4
  @@ -7,9 +7,6 @@
   
   package org.jboss.cache.pojo;
   
  -import java.lang.reflect.Field;
  -import java.util.List;
  -
   import org.jboss.aop.Advised;
   import org.jboss.aop.Domain;
   import org.jboss.aop.InstanceAdvisor;
  @@ -21,11 +18,14 @@
   import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor;
   import org.jboss.cache.pojo.interceptors.dynamic.ReentrancyStopperInterceptor;
   
  +import java.lang.reflect.Field;
  +import java.util.List;
  +
   /**
    * Utility class for method wrappers that we are interested to rollback (i.e., rollback).
    *
    * @author Ben Wang
  - * @version $Id: PojoUtil.java,v 1.3 2007/04/23 02:53:22 jgreene Exp $
  + * @version $Id: PojoUtil.java,v 1.4 2007/05/23 10:28:52 msurtani Exp $
    */
   public class PojoUtil
   {
  
  
  
  1.4       +41 -38    JBossCache/src/org/jboss/cache/pojo/MethodDeclarations.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MethodDeclarations.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/MethodDeclarations.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- MethodDeclarations.java	23 Apr 2007 02:53:22 -0000	1.3
  +++ MethodDeclarations.java	23 May 2007 10:28:52 -0000	1.4
  @@ -7,28 +7,31 @@
   
   package org.jboss.cache.pojo;
   
  -import java.lang.reflect.Field;
  -import java.lang.reflect.Method;
  -import java.util.List;
  -
   import org.jboss.aop.InstanceAdvisor;
   import org.jboss.aop.advice.Interceptor;
   import org.jboss.cache.Fqn;
   
  +import java.lang.reflect.Field;
  +import java.lang.reflect.Method;
  +import java.util.List;
  +
   /**
    * Method declarations for rollback method mostly.
    *
    * @author Ben Wang
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class MethodDeclarations
   {
      public static final Method attachInterceptor;
      public static final Method detachInterceptor;
      public static final Method undoAttachInterceptor;
  -   public static final Method undoDetachInterceptor;;
  -   public static final Method inMemorySubstitution;;
  -   public static final Method undoInMemorySubstitution;;
  +   public static final Method undoDetachInterceptor;
  +   ;
  +   public static final Method inMemorySubstitution;
  +   ;
  +   public static final Method undoInMemorySubstitution;
  +   ;
      public static final Method incrementReferenceCount;
      public static final Method decrementReferenceCount;
      public static final Method undoIncrementReferenceCount;
  @@ -39,25 +42,25 @@
           try
           {
              attachInterceptor = PojoUtil.class.getDeclaredMethod("attachInterceptor",
  -                   new Class[] {Object.class, InstanceAdvisor.class, Interceptor.class});
  +                                                              new Class[]{Object.class, InstanceAdvisor.class, Interceptor.class});
              detachInterceptor = PojoUtil.class.getDeclaredMethod("detachInterceptor",
  -                   new Class[] {InstanceAdvisor.class, Interceptor.class});
  +                                                              new Class[]{InstanceAdvisor.class, Interceptor.class});
              undoAttachInterceptor = PojoUtil.class.getDeclaredMethod("undoAttachInterceptor",
  -                   new Class[] {Object.class, InstanceAdvisor.class, Interceptor.class});
  +                                                                  new Class[]{Object.class, InstanceAdvisor.class, Interceptor.class});
              undoDetachInterceptor = PojoUtil.class.getDeclaredMethod("undoDetachInterceptor",
  -                   new Class[] {InstanceAdvisor.class, Interceptor.class});
  +                                                                  new Class[]{InstanceAdvisor.class, Interceptor.class});
              inMemorySubstitution = PojoUtil.class.getDeclaredMethod("inMemorySubstitution",
  -                   new Class[] {Object.class, Field.class, Object.class});
  +                                                                 new Class[]{Object.class, Field.class, Object.class});
              undoInMemorySubstitution = PojoUtil.class.getDeclaredMethod("undoInMemorySubstitution",
  -                   new Class[] {Object.class, Field.class, Object.class});
  +                                                                     new Class[]{Object.class, Field.class, Object.class});
              incrementReferenceCount = PojoUtil.class.getDeclaredMethod("incrementReferenceCount",
  -                   new Class[] {Fqn.class, int.class, List.class});
  +                                                                    new Class[]{Fqn.class, int.class, List.class});
              decrementReferenceCount = PojoUtil.class.getDeclaredMethod("decrementReferenceCount",
  -                   new Class[] {Fqn.class, int.class, List.class});
  +                                                                    new Class[]{Fqn.class, int.class, List.class});
              undoIncrementReferenceCount = PojoUtil.class.getDeclaredMethod("undoIncrementReferenceCount",
  -                   new Class[] {Fqn.class, int.class, List.class});
  +                                                                        new Class[]{Fqn.class, int.class, List.class});
              undoDecrementReferenceCount = PojoUtil.class.getDeclaredMethod("undoDecrementReferenceCount",
  -                   new Class[] {Fqn.class, int.class, List.class});
  +                                                                        new Class[]{Fqn.class, int.class, List.class});
           }
           catch (NoSuchMethodException e)
           {
  
  
  



More information about the jboss-cvs-commits mailing list