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

[Tom Elrod]

  User: telrod  
  Date: 07/03/19 23:18:42

  Modified:    src/main/org/jboss/remoting/transport/socket   Tag:
                        remoting_2_x ServerThread.java
                        MicroSocketClientInvoker.java
  Log:
  Updates for 2.2.0.GA release.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.29.2.20 +16 -14    JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerThread.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerThread.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerThread.java,v
  retrieving revision 1.29.2.19
  retrieving revision 1.29.2.20
  diff -u -b -r1.29.2.19 -r1.29.2.20
  --- ServerThread.java	2 Mar 2007 08:06:13 -0000	1.29.2.19
  +++ ServerThread.java	20 Mar 2007 03:18:42 -0000	1.29.2.20
  @@ -64,7 +64,7 @@
    * @author <a href="mailto:tom at jboss.org">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.29.2.19 $
  + * @version $Revision: 1.29.2.20 $
    */
   public class ServerThread extends Thread
   {
  @@ -634,6 +634,7 @@
         {
            case Version.VERSION_1:
            case Version.VERSION_2:
  +         case Version.VERSION_2_2:
            {
               if(trace) { log.trace("blocking to read invocation from unmarshaller"); }
   
  @@ -646,7 +647,7 @@
            default:
            {
               throw new IOException("Can not read data for version " + version +
  -               ".  Supported versions: " + Version.VERSION_1 + "," + Version.VERSION_2);
  +               ".  Supported versions: " + Version.VERSION_1 + "," + Version.VERSION_2 + "," + Version.VERSION_2_2);
            }
         }
      }
  @@ -774,6 +775,7 @@
         {
            case Version.VERSION_1:
            case Version.VERSION_2:
  +         case Version.VERSION_2_2:
            {
               marshaller.write(resp, outputStream);
               if (trace) { log.trace("wrote response to the output stream"); }
  @@ -782,7 +784,7 @@
            default:
            {
               throw new IOException("Can not write data for version " + version +
  -               ".  Supported version: " + Version.VERSION_1 + ", " + Version.VERSION_2);
  +               ".  Supported version: " + Version.VERSION_1 + ", " + Version.VERSION_2 + ", " + Version.VERSION_2_2);
            }
         }
      }
  
  
  
  1.16.2.26 +17 -15    JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MicroSocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java,v
  retrieving revision 1.16.2.25
  retrieving revision 1.16.2.26
  diff -u -b -r1.16.2.25 -r1.16.2.26
  --- MicroSocketClientInvoker.java	25 Feb 2007 20:54:50 -0000	1.16.2.25
  +++ MicroSocketClientInvoker.java	20 Mar 2007 03:18:42 -0000	1.16.2.26
  @@ -36,7 +36,7 @@
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.16.2.25 $
  + * @version $Revision: 1.16.2.26 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -931,6 +931,7 @@
         {
            case Version.VERSION_1:
            case Version.VERSION_2:
  +         case Version.VERSION_2_2:
            {
               if (trace) { log.trace(this + " reading response from unmarshaller"); }
               return unmarshaller.read(inputStream, null);
  @@ -938,7 +939,7 @@
            default:
            {
               throw new IOException("Can not read data for version " + version + ". " +
  -               "Supported versions: " + Version.VERSION_1 + ", " + Version.VERSION_2);
  +               "Supported versions: " + Version.VERSION_1 + ", " + Version.VERSION_2 + ", " + Version.VERSION_2_2);
            }
         }
      }
  @@ -951,6 +952,7 @@
         {
            case Version.VERSION_1:
            case Version.VERSION_2:
  +         case Version.VERSION_2_2:
            {
               if (trace) { log.trace(this + " writing invocation to marshaller"); }
               marshaller.write(invocation, outputStream);
  @@ -961,7 +963,7 @@
            default:
            {
               throw new IOException("Can not write data for version " + version + ".  " +
  -               "Supported versions: " + Version.VERSION_1 + ", " + Version.VERSION_2);
  +               "Supported versions: " + Version.VERSION_1 + ", " + Version.VERSION_2 + ", " + Version.VERSION_2_2);
            }
         }
      }