[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/socket ...

[Tom Elrod]

  User: telrod  
  Date: 06/10/30 23:37:53

  Modified:    src/main/org/jboss/remoting/transport/socket  
                        ClientSocketWrapper.java ServerSocketWrapper.java
  Log:
  JBREM-597 - changed to raw socket stream passed to marshaller and unmarshaller instead of being wrapped in object stream beforehand.
  
  Revision  Changes    Path
  1.16      +22 -20    JBossRemoting/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClientSocketWrapper.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- ClientSocketWrapper.java	30 Dec 2005 05:26:38 -0000	1.15
  +++ ClientSocketWrapper.java	31 Oct 2006 04:37:53 -0000	1.16
  @@ -22,25 +22,21 @@
   
   package org.jboss.remoting.transport.socket;
   
  -import java.io.BufferedInputStream;
  -import java.io.BufferedOutputStream;
  +import org.jboss.remoting.InvokerLocator;
  +
   import java.io.IOException;
   import java.io.InputStream;
  -import java.io.ObjectInputStream;
  -import java.io.ObjectOutputStream;
   import java.io.OutputStream;
   import java.net.Socket;
   import java.util.Map;
  -import org.jboss.remoting.InvokerLocator;
  -import org.jboss.remoting.serialization.SerializationStreamFactory;
   
   /**
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
    */
   public class ClientSocketWrapper extends SocketWrapper
   {
  -   private ObjectInputStream in;
  -   private ObjectOutputStream out;
  +   private InputStream in;
  +   private OutputStream out;
   
      public ClientSocketWrapper(Socket socket) throws IOException
      {
  @@ -76,20 +72,22 @@
         in = createInputStream(serializationType, socket);
      }
   
  -   protected ObjectInputStream createInputStream(String serializationType, Socket socket)
  +   protected InputStream createInputStream(String serializationType, Socket socket)
            throws IOException
      {
  -      BufferedInputStream bin = new BufferedInputStream(socket.getInputStream());
  -      ObjectInputStream oin = SerializationStreamFactory.getManagerInstance(serializationType).createInput(bin, null);
  -      return oin;
  +//      BufferedInputStream bin = new BufferedInputStream(socket.getInputStream());
  +//      ObjectInputStream oin = SerializationStreamFactory.getManagerInstance(serializationType).createInput(bin, null);
  +//      return oin;
  +      return socket.getInputStream();
      }
   
  -   protected ObjectOutputStream createOutputStream(String serializationType, Socket socket)
  +   protected OutputStream createOutputStream(String serializationType, Socket socket)
            throws IOException
      {
  -      BufferedOutputStream bout = new BufferedOutputStream(socket.getOutputStream());
  -      ObjectOutputStream oout = SerializationStreamFactory.getManagerInstance(serializationType).createOutput(bout);
  -      return oout;
  +//      BufferedOutputStream bout = new BufferedOutputStream(socket.getOutputStream());
  +//      ObjectOutputStream oout = SerializationStreamFactory.getManagerInstance(serializationType).createOutput(bout);
  +//      return oout;
  +      return socket.getOutputStream();
      }
   
      public OutputStream getOutputStream()
  @@ -104,13 +102,17 @@
   
      public void checkConnection() throws IOException
      {
  +      System.out.println(this + " checkConnectionCalled()");
         // Test to see if socket is alive by send ACK message
         final byte ACK = 1;
   
  -      out.reset();
  -      out.writeByte(ACK);
  -      out.flush();
  -      in.readByte();
  +//      out.reset();
  +//      out.writeByte(ACK);
  +//      out.flush();
  +//      in.readByte();
   
  +      out.write(ACK);
  +      out.flush();
  +      in.read();
      }
   }
  
  
  
  1.15      +28 -20    JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerSocketWrapper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerSocketWrapper.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerSocketWrapper.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- ServerSocketWrapper.java	27 Mar 2006 22:47:01 -0000	1.14
  +++ ServerSocketWrapper.java	31 Oct 2006 04:37:53 -0000	1.15
  @@ -22,16 +22,14 @@
   
   package org.jboss.remoting.transport.socket;
   
  -import java.io.BufferedInputStream;
  -import java.io.BufferedOutputStream;
  +import org.jboss.logging.Logger;
  +
   import java.io.EOFException;
   import java.io.IOException;
  -import java.io.ObjectInputStream;
  -import java.io.ObjectOutputStream;
  +import java.io.InputStream;
  +import java.io.OutputStream;
   import java.net.Socket;
   import java.util.Map;
  -import org.jboss.logging.Logger;
  -import org.jboss.remoting.serialization.SerializationStreamFactory;
   
   /**
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
  @@ -50,31 +48,36 @@
         super(socket, metadata, timeout);
      }
   
  -   protected ObjectInputStream createInputStream(String serializationType, Socket socket) throws IOException
  +   protected InputStream createInputStream(String serializationType, Socket socket) throws IOException
      {
  -      BufferedInputStream bin = new BufferedInputStream(socket.getInputStream());
  -      ObjectInputStream oin = SerializationStreamFactory.getManagerInstance(serializationType).createInput(bin, null);
  -      return oin;
  +//      BufferedInputStream bin = new BufferedInputStream(socket.getInputStream());
  +//      ObjectInputStream oin = SerializationStreamFactory.getManagerInstance(serializationType).createInput(bin, null);
  +//      return oin;
  +      return socket.getInputStream();
      }
   
  -   protected ObjectOutputStream createOutputStream(String serializationType, Socket socket)
  +   protected OutputStream createOutputStream(String serializationType, Socket socket)
            throws IOException
      {
  -      BufferedOutputStream bout = new BufferedOutputStream(socket.getOutputStream());
  -      ObjectOutputStream oout = SerializationStreamFactory.getManagerInstance(serializationType).createOutput(bout);
  -      oout.flush();
  -      return oout;
  +//      BufferedOutputStream bout = new BufferedOutputStream(socket.getOutputStream());
  +//      ObjectOutputStream oout = SerializationStreamFactory.getManagerInstance(serializationType).createOutput(bout);
  +//      oout.flush();
  +//      return oout;
  +      return socket.getOutputStream();
      }
   
      public void checkConnection() throws IOException
      {
  +      System.out.println(this + " checkConnectionCalled()");
  +
         // Perform acknowledgement to convince client
         // that the socket is still active
  -      byte ACK = 0;
  +      int ACK = 0;
         //long startWait = System.currentTimeMillis();
         try
         {
  -         ACK = ((ObjectInputStream) getInputStream()).readByte();
  +//         ACK = ((ObjectInputStream) getInputStream()).readByte();
  +         ACK = getInputStream().read();
         }
         catch(EOFException eof)
         {
  @@ -97,9 +100,14 @@
            log.trace("***acknowledge read byte" + Thread.currentThread());
         }
   
  -      ObjectOutputStream out = (ObjectOutputStream) getOutputStream();
  -      out.writeByte(ACK);
  +//      ObjectOutputStream out = (ObjectOutputStream) getOutputStream();
  +      OutputStream out = getOutputStream();
  +
  +//      out.writeByte(ACK);
  +//      out.flush();
  +//      out.reset();
  +
  +      out.write(ACK);
         out.flush();
  -      out.reset();
      }
   }