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

[Brian Stansberry]

  User: bstansberry
  Date: 06/08/13 16:10:10

  Modified:    src/org/jboss/cache/marshall   Tag:
                        Branch_JBossCache_1_4_0_MUX Marshaller.java
                        LegacyTreeCacheMarshaller.java
  Log:
  Update to 1.4.0.SP1
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.1   +3 -2      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
  retrieving revision 1.1.4.1
  diff -u -b -r1.1 -r1.1.4.1
  --- Marshaller.java	8 Jun 2006 00:42:23 -0000	1.1
  +++ Marshaller.java	13 Aug 2006 20:10:10 -0000	1.1.4.1
  @@ -119,6 +119,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;
  @@ -138,8 +140,7 @@
                   }
                   else
                   {
  -                    throw new IllegalArgumentException("LegacyTreeCacheMarshaller.extractFqn(): Unknown method call name: "
  -                            + meth.getName());
  +                    throw new IllegalArgumentException("Marshaller.extractFqn(): Unknown method call id: " + methodCall.getId());
                   }
                   break;
   
  
  
  
  1.5.4.2   +0 -0      JBossCache/src/org/jboss/cache/marshall/LegacyTreeCacheMarshaller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LegacyTreeCacheMarshaller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/LegacyTreeCacheMarshaller.java,v
  retrieving revision 1.5.4.1
  retrieving revision 1.5.4.2
  diff -u -b -r1.5.4.1 -r1.5.4.2
  --- LegacyTreeCacheMarshaller.java	21 Jul 2006 02:51:30 -0000	1.5.4.1
  +++ LegacyTreeCacheMarshaller.java	13 Aug 2006 20:10:10 -0000	1.5.4.2
  @@ -33,7 +33,7 @@
    * @author Ben Wang
    * @author Manik Surtani
     *
  - * @version $Id: LegacyTreeCacheMarshaller.java,v 1.5.4.1 2006/07/21 02:51:30 bstansberry Exp $
  + * @version $Id: LegacyTreeCacheMarshaller.java,v 1.5.4.2 2006/08/13 20:10:10 bstansberry Exp $
    */
   public class LegacyTreeCacheMarshaller extends Marshaller
   {