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

[Manik Surtani]

  User: msurtani
  Date: 06/08/25 08:41:35

  Modified:    src/org/jboss/cache   TransactionEntry.java
                        TransactionTable.java
  Log:
  - "modernised" MethodDeclarations
  - removed unnessary method maps in various interceptors, replaced with methods in MethodDeclarations
  - some work on replacing JGroups MethodCall with JBCMethodCall
  
  Revision  Changes    Path
  1.11      +8 -7      JBossCache/src/org/jboss/cache/TransactionEntry.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransactionEntry.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TransactionEntry.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- TransactionEntry.java	18 Aug 2006 19:34:21 -0000	1.10
  +++ TransactionEntry.java	25 Aug 2006 12:41:35 -0000	1.11
  @@ -9,6 +9,7 @@
   
   import org.jboss.cache.lock.IdentityLock;
   import org.jboss.cache.config.Option;
  +import org.jboss.cache.marshall.JBCMethodCall;
   import org.jgroups.blocks.MethodCall;
   
   import org.apache.commons.logging.Log;
  @@ -31,7 +32,7 @@
    * </ul>
    *
    * @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 14, 2003
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   public class TransactionEntry {
   
  @@ -46,8 +47,8 @@
      /**
       * List<MethodCall> of modifications ({@link MethodCall}). They will be replicated on TX commit
       */
  -   protected List<MethodCall> modification_list=new LinkedList<MethodCall>();
  -   protected List<MethodCall> cl_mod_list = new LinkedList<MethodCall>();
  +   protected List<JBCMethodCall> modification_list=new LinkedList<JBCMethodCall>();
  +   protected List<JBCMethodCall> cl_mod_list = new LinkedList<JBCMethodCall>();
   
      /**
       * List<MethodCall>. List of compensating {@link org.jgroups.blocks.MethodCall} objects
  @@ -77,12 +78,12 @@
      /**
       * Adds a modification to the modification list.
       */
  -   public void addModification(MethodCall m) {
  +   public void addModification(JBCMethodCall m) {
         if (m == null) return;
         modification_list.add(m);
      }
   
  -    public void addCacheLoaderModification(MethodCall m)
  +    public void addCacheLoaderModification(JBCMethodCall m)
       {
           if (m!=null) cl_mod_list.add(m);
       }
  @@ -91,11 +92,11 @@
      /**
       * Returns all modifications.
       */
  -   public List<MethodCall> getModifications() {
  +   public List<JBCMethodCall> getModifications() {
         return modification_list;
      }
   
  -   public List<MethodCall> getCacheLoaderModifications()
  +   public List<JBCMethodCall> getCacheLoaderModifications()
      {
          return cl_mod_list;
      }
  
  
  
  1.8       +4 -3      JBossCache/src/org/jboss/cache/TransactionTable.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransactionTable.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TransactionTable.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- TransactionTable.java	12 Jun 2006 20:24:32 -0000	1.7
  +++ TransactionTable.java	25 Aug 2006 12:41:35 -0000	1.8
  @@ -11,6 +11,7 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.lock.IdentityLock;
  +import org.jboss.cache.marshall.JBCMethodCall;
   import org.jgroups.blocks.MethodCall;
   
   import javax.transaction.Transaction;
  @@ -25,7 +26,7 @@
    * given TX.
    *
    * @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 14, 2003
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   public class TransactionTable {
   
  @@ -145,7 +146,7 @@
      /**
       * Adds a motification to the global transaction.
       */
  -   public void addModification(GlobalTransaction gtx, MethodCall m) {
  +   public void addModification(GlobalTransaction gtx, JBCMethodCall m) {
         TransactionEntry entry=get(gtx);
         if(entry == null) {
            log.error("transaction not found (gtx=" + gtx + ")");
  @@ -154,7 +155,7 @@
         entry.addModification(m);
      }
   
  -    public void addCacheLoaderModification(GlobalTransaction gtx, MethodCall m)
  +    public void addCacheLoaderModification(GlobalTransaction gtx, JBCMethodCall m)
       {
           TransactionEntry entry = get(gtx);
           if(entry == null) {