jboss-cvs-commits

[Clebert S. <csu...@jb...>]

  User: csuconic
  Date: 06/07/10 12:03:35

  Modified:    src/org/jboss/serial/objectmetamodel 
                        ObjectDescriptorFactory.java
  Log:
  JBSER-83 - fix
  
  Revision  Changes    Path
  1.31      +27 -23    jboss-serialization/src/org/jboss/serial/objectmetamodel/ObjectDescriptorFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ObjectDescriptorFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-serialization/src/org/jboss/serial/objectmetamodel/ObjectDescriptorFactory.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- ObjectDescriptorFactory.java	3 May 2006 17:00:16 -0000	1.30
  +++ ObjectDescriptorFactory.java	10 Jul 2006 16:03:35 -0000	1.31
  @@ -40,6 +40,7 @@
   import org.jboss.serial.finalcontainers.ShortContainer;
   import org.jboss.serial.objectmetamodel.ObjectsCache.JBossSeralizationInputInterface;
   import org.jboss.serial.objectmetamodel.ObjectsCache.JBossSeralizationOutputInterface;
  +import org.jboss.serial.persister.ClassReferencePersister;
   import org.jboss.serial.persister.PersistResolver;
   import org.jboss.serial.persister.Persister;
   import org.jboss.serial.util.ClassMetaConsts;
  @@ -410,6 +411,8 @@
   
           Object value = persister.readData(cache.getLoader(), streamingClass, metaData, reference, cache, cache.getInput(), cache.getSubstitution());
   
  +        if (!(persister instanceof ClassReferencePersister)) //JBSER-83
  +        {
           if (cache.getSubstitution()!=null)
           {
               value = cache.getSubstitution().replaceObject(value);
  @@ -435,6 +438,7 @@
           {
               throw new SerializationException(e);
           }
  +        }
   
           return value;
       }