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

[Manik Surtani]

  User: msurtani
  Date: 06/08/30 09:40:34

  Modified:    src/org/jboss/cache/marshall  Marshaller.java
  Log:
  JBCACHE-755
  
  Revision  Changes    Path
  1.4       +298 -296  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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Marshaller.java	25 Aug 2006 14:10:08 -0000	1.3
  +++ Marshaller.java	30 Aug 2006 13:40:34 -0000	1.4
  @@ -11,11 +11,9 @@
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.buddyreplication.BuddyManager;
  -import org.jboss.cache.marshall.MethodCall;
   
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
  -import java.lang.reflect.Method;
   import java.util.List;
   
   /**
  @@ -92,7 +90,6 @@
               throw new NullPointerException("method call is null");
           }
   
  -        Method meth = methodCall.getMethod();
           String fqnStr = null;
           Object[] args = methodCall.getArgs();
           switch (methodCall.getMethodId())
  @@ -104,7 +101,7 @@
                   fqnStr = extractFqn((MethodCall) modifications.get(0));
   
                   // the last arg of a prepare call is the one-phase flag
  -                boolean one_phase_commit = ((Boolean) args[args.length - 1]).booleanValue();
  +            boolean one_phase_commit = (Boolean) args[args.length - 1];
   
                   // If this is two phase commit, map the FQN to the GTX so
                   // we can find it when the commit/rollback comes through
  @@ -120,6 +117,8 @@
                   break;
               case MethodDeclarations.getPartialStateMethod_id:
               case MethodDeclarations.dataGravitationMethod_id:
  +         case MethodDeclarations.evictNodeMethodLocal_id:
  +         case MethodDeclarations.evictVersionedNodeMethodLocal_id:
                   Fqn fqn = (Fqn) args[0];
                   fqnStr = fqn.toString();
                   break;
  @@ -131,6 +130,10 @@
               case MethodDeclarations.remoteAssignToBuddyGroupMethod_id:
               case MethodDeclarations.remoteRemoveFromBuddyGroupMethod_id:
                   break;
  +         case MethodDeclarations.replicateMethod_id:
  +            // possible when we have a replication queue.
  +            fqnStr = extractFqn((MethodCall) args[0]);
  +            break;
               default :
                   if (MethodDeclarations.isCrudMethod(methodCall.getMethodId()))
                   {
  @@ -139,8 +142,7 @@
                   }
                   else
                   {
  -                    throw new IllegalArgumentException("LegacyTreeCacheMarshaller.extractFqn(): Unknown method call name: "
  -                            + meth.getName());
  +               throw new IllegalArgumentException("Marshaller.extractFqn(): Unknown id in method call: " + methodCall);
                   }
                   break;
   
  @@ -171,7 +173,7 @@
        *
        * @param fqn
        * @param cl
  -     * @throws org.jboss.cache.marshall.RegionNameConflictException thrown if there is a conflict in region definition.
  +    * @throws RegionNameConflictException thrown if there is a conflict in region definition.
        */
       public void registerClassLoader(String fqn, ClassLoader cl)
               throws RegionNameConflictException
  @@ -216,7 +218,7 @@
        * @return the classloader associated with the cache region rooted by
        *         <code>fqn</code>, or <code>null</code> if no classloader has
        *         been associated with the region.
  -     * @throws org.jboss.cache.marshall.RegionNotFoundException
  +    * @throws RegionNotFoundException
        */
       public ClassLoader getClassLoader(String fqn) throws RegionNotFoundException
       {
  @@ -272,7 +274,7 @@
        * rooted in the given Fqn.
        *
        * @param fqn
  -     * @throws org.jboss.cache.marshall.RegionNameConflictException if there is a conflict in region definition.
  +    * @throws RegionNameConflictException if there is a conflict in region definition.
        */
       public void inactivate(String fqn) throws RegionNameConflictException
       {