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

[Manik Surtani]

  User: msurtani
  Date: 07/01/31 12:08:13

  Modified:    src/org/jboss/cache/marshall  Tag: Branch_JBossCache_1_4_0
                        TreeCacheMarshaller140.java
  Log:
  Allow for non-serializable objects if using JBoss Serialization
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +5 -5      JBossCache/src/org/jboss/cache/marshall/Attic/TreeCacheMarshaller140.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheMarshaller140.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/Attic/TreeCacheMarshaller140.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -b -r1.1.2.3 -r1.1.2.4
  --- TreeCacheMarshaller140.java	11 Jan 2007 18:31:35 -0000	1.1.2.3
  +++ TreeCacheMarshaller140.java	31 Jan 2007 17:08:13 -0000	1.1.2.4
  @@ -20,16 +20,16 @@
   import java.io.ObjectOutputStream;
   import java.io.Serializable;
   import java.util.ArrayList;
  +import java.util.Collection;
   import java.util.HashMap;
  +import java.util.HashSet;
   import java.util.Iterator;
  +import java.util.LinkedList;
   import java.util.List;
   import java.util.Map;
  -import java.util.LinkedList;
  +import java.util.Set;
   import java.util.TreeMap;
  -import java.util.HashSet;
   import java.util.TreeSet;
  -import java.util.Collection;
  -import java.util.Set;
   
   /**
    * An enhanced marshaller for RPC calls between TreeCache instances.
  @@ -305,7 +305,7 @@
               out.writeShort(refId);
               out.writeUTF((String) o);
           }
  -        else if (o instanceof Serializable)
  +        else if (o instanceof Serializable || ObjectSerializationFactory.useJBossSerialization())
           {
               int refId = createReference(o, refMap);
               if (log.isTraceEnabled()) log.trace("Warning: using object serialization for " + o.getClass());