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

[Manik Surtani]

  User: msurtani
  Date: 07/03/05 08:32:56

  Modified:    src/org/jboss/cache/marshall   Tag: Branch_JBossCache_1_4_0
                        MethodDeclarations.java Marshaller.java
  Log:
  JBCACHE-997
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.3   +7 -1      JBossCache/src/org/jboss/cache/marshall/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/marshall/MethodDeclarations.java,v
  retrieving revision 1.8.2.2
  retrieving revision 1.8.2.3
  diff -u -b -r1.8.2.2 -r1.8.2.3
  --- MethodDeclarations.java	13 Nov 2006 13:00:04 -0000	1.8.2.2
  +++ MethodDeclarations.java	5 Mar 2007 13:32:56 -0000	1.8.2.3
  @@ -32,7 +32,7 @@
    * allowing lookup operations both ways.
    *
    * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
  - * @version $Revision: 1.8.2.2 $
  + * @version $Revision: 1.8.2.3 $
    */
   public class MethodDeclarations
   {
  @@ -533,4 +533,10 @@
      {
         return methodId == MethodDeclarations.dataGravitationCleanupMethod_id || methodId == MethodDeclarations.dataGravitationMethod_id;
      }
  +
  +   public static boolean isGetMethod(int methodId)
  +   {
  +      return methodId == getChildrenNamesMethodLocal_id || methodId == getDataMapMethodLocal_id || methodId == existsMethod_id
  +              || methodId == getKeysMethodLocal_id || methodId == getKeyValueMethodLocal_id || methodId == getNodeMethodLocal_id;
  +   }
   }
  
  
  
  1.1.2.4   +9 -8      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.1.2.3
  retrieving revision 1.1.2.4
  diff -u -b -r1.1.2.3 -r1.1.2.4
  --- Marshaller.java	2 Feb 2007 13:20:49 -0000	1.1.2.3
  +++ Marshaller.java	5 Mar 2007 13:32:56 -0000	1.1.2.4
  @@ -121,33 +121,34 @@
            case MethodDeclarations.dataGravitationMethod_id:
            case MethodDeclarations.evictNodeMethodLocal_id:
            case MethodDeclarations.evictVersionedNodeMethodLocal_id:
  -            Fqn fqn = (Fqn) args[0];
  -            fqnStr = fqn.toString();
  +            fqnStr = args[0].toString();
               break;
            case MethodDeclarations.dataGravitationCleanupMethod_id:
  -            Fqn fqn1 = (Fqn) args[1];
  -            fqnStr = fqn1.toString();
  +            fqnStr = args[1].toString();
               break;
            case MethodDeclarations.remoteAnnounceBuddyPoolNameMethod_id:
            case MethodDeclarations.remoteAssignToBuddyGroupMethod_id:
            case MethodDeclarations.remoteRemoveFromBuddyGroupMethod_id:
               break;
            case MethodDeclarations.replicateMethod_id:
  -            // possible when we have a replication queue.
  +         case MethodDeclarations.clusteredGetMethod_id:
  +            // possible when we have a replication queue or a clustered get call
               fqnStr = extractFqn((JBCMethodCall) args[0]);
               break;
            default :
               if (MethodDeclarations.isCrudMethod(meth))
               {
  -               Fqn fqn2 = (Fqn) args[1];
  -               fqnStr = fqn2.toString();
  +               fqnStr = args[1].toString();
  +            }
  +            else if (MethodDeclarations.isGetMethod(methodCall.getMethodId()))
  +            {
  +               fqnStr = args[0].toString();
               }
               else
               {
                  throw new IllegalArgumentException("Marshaller.extractFqn(): Unknown method call id: " + methodCall.getMethodId());
               }
               break;
  -
         }
   
         if (log.isTraceEnabled())