[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/serialization/impl/jboss ...

[Tom Elrod]

  User: telrod  
  Date: 06/07/21 15:40:08

  Modified:    src/main/org/jboss/remoting/serialization/impl/jboss 
                        JBossSerializationManager.java
  Log:
  JBREM-435 - adding jboss-remoting-serialization.jar to distribution build.
  
  Revision  Changes    Path
  1.11      +24 -24    JBossRemoting/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossSerializationManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- JBossSerializationManager.java	7 Jul 2006 20:29:59 -0000	1.10
  +++ JBossSerializationManager.java	21 Jul 2006 19:40:08 -0000	1.11
  @@ -23,26 +23,25 @@
   
   package org.jboss.remoting.serialization.impl.jboss;
   
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.ObjectInputStream;
  -import java.io.ObjectOutputStream;
  -import java.io.OutputStream;
   import org.jboss.logging.Logger;
   import org.jboss.remoting.loading.ObjectInputStreamWithClassLoader;
  +import org.jboss.remoting.serialization.IMarshalledValue;
   import org.jboss.remoting.serialization.SerializationManager;
   import org.jboss.remoting.serialization.SerializationStreamFactory;
   import org.jboss.serial.io.JBossObjectInputStream;
   import org.jboss.serial.io.JBossObjectOutputStream;
  -import org.jboss.serial.io.MarshalledObjectForLocalCalls;
  -import org.jboss.serial.objectmetamodel.safecloning.SafeCloningRepository;
   import org.jboss.serial.util.StringUtilBuffer;
  -import org.jboss.remoting.serialization.IMarshalledValue;
  +
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.ObjectInputStream;
  +import java.io.ObjectOutputStream;
  +import java.io.OutputStream;
   
   /**
    * Instantiates the Streamings according to JbossObjectOutputStream and JBossObjectInputStream.
    * Also, it uses a different approach for MarshallValues as we don't need to convert objects in bytes.
  - * $Id: JBossSerializationManager.java,v 1.10 2006/07/07 20:29:59 csuconic Exp $
  + * $Id: JBossSerializationManager.java,v 1.11 2006/07/21 19:40:08 telrod Exp $
    *
    * @author <a href="mailto:tclebert.suconic at jboss.com">Clebert Suconic</a>
    */
  @@ -53,20 +52,20 @@
   
      public ObjectInputStream createInput(InputStream input, ClassLoader loader) throws IOException
      {
  -      if(log.isTraceEnabled())
  +      if (log.isTraceEnabled())
         {
            log.trace("Creating JBossObjectInputStream");
         }
  -      return new JBossObjectInputStream(input, loader, new StringUtilBuffer(10024,10024));
  +      return new JBossObjectInputStream(input, loader, new StringUtilBuffer(10024, 10024));
      }
   
      public ObjectOutputStream createOutput(OutputStream output) throws IOException
      {
  -      if(log.isTraceEnabled())
  +      if (log.isTraceEnabled())
         {
            log.trace("Creating JBossObjectOutputStream");
         }
  -      return new JBossObjectOutputStream(output,new StringUtilBuffer(10024,10024));
  +      return new JBossObjectOutputStream(output, new StringUtilBuffer(10024, 10024));
      }
   
      /**
  @@ -74,7 +73,7 @@
       */
      public IMarshalledValue createdMarshalledValue(Object source) throws IOException
      {
  -      if(source instanceof IMarshalledValue)
  +      if (source instanceof IMarshalledValue)
         {
            return (IMarshalledValue) source;
         }
  @@ -84,7 +83,8 @@
         }
      }
      
  -   public IMarshalledValue createMarshalledValueForClone(Object original) throws IOException {
  +   public IMarshalledValue createMarshalledValueForClone(Object original) throws IOException
  +   {
   		return new SmartCloningMarshalledValue(original);
   	}
   
  @@ -99,29 +99,29 @@
      {
         ObjectInputStream objInputStream = null;
         Object obj = null;
  -      if(inputStream instanceof ObjectInputStreamWithClassLoader)
  +      if (inputStream instanceof ObjectInputStreamWithClassLoader)
         {
  -         if(((ObjectInputStreamWithClassLoader) inputStream).getClassLoader() == null)
  +         if (((ObjectInputStreamWithClassLoader) inputStream).getClassLoader() == null)
            {
               ((ObjectInputStreamWithClassLoader) inputStream).setClassLoader(customClassLoader);
            }
            objInputStream = (ObjectInputStream) inputStream;
         }
  -      else if(inputStream instanceof JBossObjectInputStream)
  +      else if (inputStream instanceof JBossObjectInputStream)
         {
  -         if(((JBossObjectInputStream) inputStream).getClassLoader() == null)
  +         if (((JBossObjectInputStream) inputStream).getClassLoader() == null)
            {
               ((JBossObjectInputStream) inputStream).setClassLoader(customClassLoader);
            }
            objInputStream = (ObjectInputStream) inputStream;
         }
  -      else if(inputStream instanceof ObjectInputStream)
  +      else if (inputStream instanceof ObjectInputStream)
         {
            objInputStream = (ObjectInputStream) inputStream;
         }
         else
         {
  -         if(customClassLoader != null)
  +         if (customClassLoader != null)
            {
               objInputStream = SerializationStreamFactory.getManagerInstance(SerializationStreamFactory.JBOSS).createInput(inputStream, customClassLoader);
            }