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

[Manik Surtani]

  User: msurtani
  Date: 06/12/30 14:48:49

  Modified:    src/org/jboss/cache/marshall  Marshaller.java
  Log:
  Genericised, autoboxed
  
  Revision  Changes    Path
  1.7       +5 -3      JBossCache/src/org/jboss/cache/marshall/Marshaller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Marshaller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/Marshaller.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- Marshaller.java	8 Dec 2006 18:49:18 -0000	1.6
  +++ Marshaller.java	30 Dec 2006 19:48:49 -0000	1.7
  @@ -9,6 +9,7 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.Fqn;
  +import org.jboss.cache.GlobalTransaction;
   import org.jboss.cache.Region;
   import org.jboss.cache.RegionManager;
   import org.jboss.cache.buddyreplication.BuddyManager;
  @@ -16,6 +17,7 @@
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
   import java.util.List;
  +import java.util.Map;
   import java.util.concurrent.ConcurrentHashMap;
   
   /**
  @@ -33,7 +35,7 @@
      /**
       * Map<GlobalTransaction, Fqn> for prepared tx that have not committed
       */
  -   private ConcurrentHashMap transactions = new ConcurrentHashMap(16);
  +   private Map<GlobalTransaction, String> transactions = new ConcurrentHashMap<GlobalTransaction, String>(16);
   
      protected void init(RegionManager manager, boolean defaultInactive, boolean useRegionBasedMarshalling)
      {
  @@ -109,13 +111,13 @@
               // we can find it when the commit/rollback comes through
               if (!one_phase_commit)
               {
  -               transactions.put(args[0], fqnStr);
  +               transactions.put((GlobalTransaction) args[0], fqnStr);
               }
               break;
            case MethodDeclarations.rollbackMethod_id:
            case MethodDeclarations.commitMethod_id:
               // We stored the fqn in the transactions map during the prepare phase
  -            fqnStr = (String) transactions.remove(args[0]);
  +            fqnStr = transactions.remove(args[0]);
               break;
            case MethodDeclarations.getPartialStateMethod_id:
            case MethodDeclarations.dataGravitationMethod_id: