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

[Manik Surtani]

  User: msurtani
  Date: 07/01/26 06:35:13

  Modified:    src/org/jboss/cache/marshall  CacheMarshaller200.java
  Log:
  Fixed dumbass bug in marshaller
  
  Revision  Changes    Path
  1.8       +13 -2     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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- CacheMarshaller200.java	17 Jan 2007 14:13:06 -0000	1.7
  +++ CacheMarshaller200.java	26 Jan 2007 11:35:13 -0000	1.8
  @@ -160,7 +160,7 @@
         Map<Object, Integer> refMap = new HashMap<Object, Integer>();
         if (useRegionBasedMarshalling) // got to check again in case this meth is called directly
         {
  -         log.trace("Writing region to stream");
  +         log.trace("Writing region " +region+ " to stream");
            marshallObject(region, out, refMap);
         }
         marshallObject(o, out, refMap);
  @@ -169,7 +169,18 @@
      protected Object objectFromObjectStreamRegionBased(ObjectInputStream in) throws Exception
      {
         Map<Integer, Object> refMap = new HashMap<Integer, Object>();
  -      String regionString = (String) unmarshallObject(in, refMap);
  +      Object o = unmarshallObject(in, refMap);
  +      String regionString = null;
  +      if (o == null)
  +      {
  +         // a null region.  Could happen.  Use std marshalling.
  +         log.trace("Unmarshalled region as null.  Not using a context class loader to unmarshall.");
  +      }
  +      else
  +      {
  +         regionString = (String) o;
  +      }
  +
         if (log.isTraceEnabled()) log.trace("Unmarshalled regionString " + regionString + " from stream");
   
         Region region = null;