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

[Manik Surtani]

  User: msurtani
  Date: 06/08/30 08:00:33

  Modified:    src/org/jboss/cache/marshall  Tag: Branch_JBossCache_1_4_0
                        Marshaller.java
  Log:
  Fixed JBCACHE-755 - Using replication queue with region based marshalling breaks TreeCacheMarshaller
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +299 -295  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.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- Marshaller.java	8 Aug 2006 15:32:55 -0000	1.1.2.1
  +++ Marshaller.java	30 Aug 2006 12:00:33 -0000	1.1.2.2
  @@ -132,6 +132,10 @@
               case MethodDeclarations.remoteAssignToBuddyGroupMethod_id:
               case MethodDeclarations.remoteRemoveFromBuddyGroupMethod_id:
                   break;
  +         case MethodDeclarations.replicateMethod_id:
  +            // possible when we have a replication queue.
  +            fqnStr = extractFqn((JBCMethodCall) args[0]);
  +            break;
               default :
                   if (MethodDeclarations.isCrudMethod(meth))
                   {
  @@ -171,7 +175,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 +220,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 +276,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
       {