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

[Manik Surtani]

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

  Modified:    src/org/jboss/cache/loader  AbstractCacheLoader.java
  Log:
  Fixed dumbass bug in marshaller
  
  Revision  Changes    Path
  1.22      +8 -1      JBossCache/src/org/jboss/cache/loader/AbstractCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/AbstractCacheLoader.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- AbstractCacheLoader.java	24 Jan 2007 18:23:07 -0000	1.21
  +++ AbstractCacheLoader.java	26 Jan 2007 11:35:13 -0000	1.22
  @@ -15,6 +15,7 @@
   import org.jboss.cache.marshall.Marshaller;
   import org.jboss.cache.marshall.NodeData;
   import org.jboss.cache.marshall.NodeDataExceptionMarker;
  +import org.jboss.cache.marshall.NodeDataMarker;
   import org.jboss.cache.util.MapCopy;
   
   import java.io.ObjectInputStream;
  @@ -75,7 +76,13 @@
         // store new state
         Fqn fqn = null;
         //NodeData nd = null;
  -      List nodeData = (List) cache.getMarshaller().objectFromObjectStream(in);
  +      Object objectFromStream = cache.getMarshaller().objectFromObjectStream(in);
  +      if (objectFromStream instanceof NodeDataMarker)
  +      {
  +         // no persistent state sent across; return?
  +         return;
  +      }
  +      List nodeData = (List) objectFromStream; 
   
         //for (nd = (NodeData) in.readObject(); nd != null && !nd.isMarker(); nd = (NodeData) in.readObject())
         for (Object o : nodeData)