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

[Ron Sigal]

  User: rsigal  
  Date: 07/05/18 22:25:47

  Modified:    src/main/org/jboss/remoting/serialization/impl/java  Tag:
                        remoting_2_x
                        JavaEncryptionSerializationManager.java
  Log:
  JBREM-714: Added versioned versions of receiveObject(), sendObject().
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.1   +75 -74    JBossRemoting/src/main/org/jboss/remoting/serialization/impl/java/JavaEncryptionSerializationManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JavaEncryptionSerializationManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/serialization/impl/java/JavaEncryptionSerializationManager.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -b -r1.1 -r1.1.4.1
  --- JavaEncryptionSerializationManager.java	25 Aug 2006 21:10:57 -0000	1.1
  +++ JavaEncryptionSerializationManager.java	19 May 2007 02:25:47 -0000	1.1.4.1
  @@ -30,20 +30,21 @@
   
   import org.jboss.remoting.marshal.encryption.EncryptionUtil;
   
  -//$Id: JavaEncryptionSerializationManager.java,v 1.1 2006/08/25 21:10:57 asaldhana Exp $
  +//$Id: JavaEncryptionSerializationManager.java,v 1.1.4.1 2007/05/19 02:25:47 rsigal Exp $
   
   /**
    *  Seals/Unseals Serialized Objects
    *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
    *  @since  Aug 25, 2006 
  - *  @version $Revision: 1.1 $
  + *  @version $Revision: 1.1.4.1 $
    */
   public class JavaEncryptionSerializationManager 
   extends JavaSerializationManager
   { 
  -   public Object receiveObject(InputStream inputStream, ClassLoader customClassLoader) throws IOException, ClassNotFoundException
  +   public Object receiveObject(InputStream inputStream, ClassLoader customClassLoader, int version)
  +   throws IOException, ClassNotFoundException
      {
  -      Object obj = super.receiveObject(inputStream, customClassLoader);
  +      Object obj = super.receiveObject(inputStream, customClassLoader, version);
         if(obj instanceof SealedObject)
         {
            try
  @@ -58,7 +59,7 @@
         return obj;
      }
    
  -   public void sendObject(ObjectOutputStream oos, Object dataObject) throws IOException
  +   public void sendObject(ObjectOutputStream oos, Object dataObject, int version) throws IOException
      {
         if(dataObject instanceof Serializable)
         try
  @@ -69,6 +70,6 @@
         { 
            e.printStackTrace();
         } 
  -      super.sendObject(oos, dataObject);
  +      super.sendObject(oos, dataObject, version);
      } 
   }