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

[Manik Surtani]

  User: msurtani
  Date: 06/11/16 10:03:00

  Modified:    src/org/jboss/cache/loader  JDBCCacheLoader.java
  Log:
  Removed legacy marshalledvalue stuff
  
  Revision  Changes    Path
  1.22      +17 -15    JBossCache/src/org/jboss/cache/loader/JDBCCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JDBCCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/JDBCCacheLoader.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- JDBCCacheLoader.java	26 Oct 2006 19:30:20 -0000	1.21
  +++ JDBCCacheLoader.java	16 Nov 2006 15:03:00 -0000	1.22
  @@ -11,7 +11,6 @@
   import org.jboss.cache.Fqn;
   import org.jboss.cache.Modification;
   import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
  -import org.jboss.aop.util.MarshalledValue;
   
   import javax.naming.InitialContext;
   import javax.naming.NamingException;
  @@ -22,7 +21,6 @@
   import java.io.InputStream;
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
  -import java.rmi.MarshalledObject;
   import java.sql.Connection;
   import java.sql.DatabaseMetaData;
   import java.sql.DriverManager;
  @@ -81,7 +79,7 @@
    *
    * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
    * @author <a href="mailto:hmesha at novell.com">Hany Mesha </a>
  - * @version <tt>$Revision: 1.21 $</tt>
  + * @version <tt>$Revision: 1.22 $</tt>
    */
   public class JDBCCacheLoader extends AbstractCacheLoader
   {
  @@ -678,10 +676,12 @@
   
            if (node != null)
            {
  -            Object marshalledNode = new MarshalledValue(node);
  +//            Object marshalledNode = new MarshalledValue(node);
               ByteArrayOutputStream baos = new ByteArrayOutputStream();
               ObjectOutputStream oos = new ObjectOutputStream(baos);
  -            oos.writeObject(marshalledNode);
  +//            oos.writeObject(marshalledNode);
  +//
  +            oos.writeObject(node);
   
               ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
               ps.setBinaryStream(2, bais, baos.size());
  @@ -761,10 +761,11 @@
            }
            //         else
            //         {
  -         Object marshalledNode = new MarshalledValue(node);
  +//         Object marshalledNode = new MarshalledValue(node);
            ByteArrayOutputStream baos = new ByteArrayOutputStream();
            ObjectOutputStream oos = new ObjectOutputStream(baos);
  -         oos.writeObject(marshalledNode);
  +//         oos.writeObject(marshalledNode);
  +         oos.writeObject(node);
   
            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
            ps.setBinaryStream(1, bais, baos.size());
  @@ -832,14 +833,15 @@
                     Object marshalledNode = ois.readObject();
   
                     // de-marshall value if possible
  -                  if (marshalledNode instanceof MarshalledValue)
  -                  {
  -                     oldNode = (Map) ((MarshalledValue) marshalledNode).get();
  -                  }
  -                  else if (marshalledNode instanceof MarshalledObject)
  -                  {
  -                     oldNode = (Map) ((MarshalledObject) marshalledNode).get();
  -                  }
  +//                  if (marshalledNode instanceof MarshalledValue)
  +//                  {
  +//                     oldNode = (Map) ((MarshalledValue) marshalledNode).get();
  +//                  }
  +//                  else if (marshalledNode instanceof MarshalledObject)
  +//                  {
  +//                     oldNode = (Map) ((MarshalledObject) marshalledNode).get();
  +//                  }
  +                  oldNode = (Map) marshalledNode;
                  }
                  catch (IOException e)
                  {