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

[Manik Surtani]

  User: msurtani
  Date: 07/01/04 00:35:37

  Modified:    src/org/jboss/cache/marshall  CacheMarshaller200.java
  Log:
  Major changes around nodes, and the way they interact with the interceptor stack.
  Also removed redundant methods in NodeSPI and removed the need for casting to NodeSPI in most cases.
  
  Revision  Changes    Path
  1.2       +6 -6      JBossCache/src/org/jboss/cache/marshall/CacheMarshaller200.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheMarshaller200.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/CacheMarshaller200.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- CacheMarshaller200.java	2 Jan 2007 13:13:20 -0000	1.1
  +++ CacheMarshaller200.java	4 Jan 2007 05:35:37 -0000	1.2
  @@ -119,16 +119,16 @@
         {
            if (!region.isActive())
            {
  -//            throw new InactiveRegionException("Cannot unmarshall message for region " + fqn
  -//                  + ". This region is inactive.");
  +            //            throw new InactiveRegionException("Cannot unmarshall message for region " + fqn
  +            //                  + ". This region is inactive.");
               throw IRE;
            }
         }
         else if (defaultInactive)
         {
            // No region but default inactive means region is inactive
  -//         throw new InactiveRegionException("Cannot unmarshall message for region " + fqn + ". By default region " + fqn
  -//               + " is inactive.");
  +         //         throw new InactiveRegionException("Cannot unmarshall message for region " + fqn + ". By default region " + fqn
  +         //               + " is inactive.");
            throw IRE;
         }
   
  @@ -167,10 +167,10 @@
         {
            out.writeByte(MAGICNUMBER_NULL);
         }
  -      else if (refMap.containsKey(o)) // see if this object has been marshalled before.
  +      else if (refMap.containsKey(o))// see if this object has been marshalled before.
         {
            out.writeByte(MAGICNUMBER_REF);
  -         out.writeShort(((Integer) refMap.get(o)).intValue());
  +         out.writeShort(refMap.get(o));
         }
         else if (o instanceof MethodCall)
         {