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

[Ron Sigal]

  User: rsigal  
  Date: 07/05/10 04:47:21

  Modified:    src/main/org/jboss/remoting/transport/socket   Tag:
                        remoting_2_2_0_GA ServerThread.java
                        MicroSocketClientInvoker.java
  Log:
  JBREM-714:  For version == 1, socket.check_connection defaults to true.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.29.2.20.2.2 +5 -1      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.20.2.1
  retrieving revision 1.29.2.20.2.2
  diff -u -b -r1.29.2.20.2.1 -r1.29.2.20.2.2
  --- ServerThread.java	9 May 2007 08:42:48 -0000	1.29.2.20.2.1
  +++ ServerThread.java	10 May 2007 08:47:21 -0000	1.29.2.20.2.2
  @@ -66,7 +66,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.20.2.1 $
  + * @version $Revision: 1.29.2.20.2.2 $
    */
   public class ServerThread extends Thread
   {
  @@ -147,6 +147,10 @@
            {
               shouldCheckConnection = Boolean.valueOf(checkValue).booleanValue();
            }
  +         else if (Version.getDefaultVersion() == Version.VERSION_1)
  +         {
  +            shouldCheckConnection = true;
  +         }
         }
      }
   
  
  
  
  1.16.2.26.2.2 +10 -7     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.26.2.1
  retrieving revision 1.16.2.26.2.2
  diff -u -b -r1.16.2.26.2.1 -r1.16.2.26.2.2
  --- MicroSocketClientInvoker.java	9 May 2007 08:43:13 -0000	1.16.2.26.2.1
  +++ MicroSocketClientInvoker.java	10 May 2007 08:47:21 -0000	1.16.2.26.2.2
  @@ -38,7 +38,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.26.2.1 $
  + * @version $Revision: 1.16.2.26.2.2 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -419,15 +419,18 @@
            }
         }
   
  +      
         val = params.get(SocketServerInvoker.CHECK_CONNECTION_KEY);
  -      if (val != null)
  +      if (val != null && ((String)val).length() > 0)
         {
            String value = (String) val;
  -         if (value.length() > 0)
  -         {
               shouldCheckConnection = Boolean.valueOf(value).booleanValue();
               log.debug(this + " setting shouldCheckConnection to " + shouldCheckConnection);
            }
  +      else if (Version.getDefaultVersion() == Version.VERSION_1)
  +      {
  +         shouldCheckConnection = true;
  +         log.debug(this + " setting shouldCheckConnection to " + shouldCheckConnection);
         }
      }