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

[Ron Sigal]

  User: rsigal  
  Date: 06/08/09 15:44:20

  Modified:    src/main/org/jboss/remoting/transport/multiplex  
                        MasterServerSocket.java VirtualServerSocket.java
  Log:
  JBREM-574:  Modified toString() to write information from actual server socket, including SSL information.
  
  Revision  Changes    Path
  1.11      +1 -1      JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/MasterServerSocket.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MasterServerSocket.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/MasterServerSocket.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- MasterServerSocket.java	22 Jul 2006 21:56:29 -0000	1.10
  +++ MasterServerSocket.java	9 Aug 2006 19:44:19 -0000	1.11
  @@ -556,7 +556,7 @@
         if (!isBound())
            return "MasterServerSocket[unbound]";
         
  -      return "MasterServerSocket[addr=" + getInetAddress() +  ",localport=" + getLocalPort()  + "]";
  +      return "MasterServerSocket[" + ss.toString()  + "]";
      }
      
      
  
  
  
  1.12      +5 -9      JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/VirtualServerSocket.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: VirtualServerSocket.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/VirtualServerSocket.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- VirtualServerSocket.java	19 Jul 2006 23:22:28 -0000	1.11
  +++ VirtualServerSocket.java	9 Aug 2006 19:44:20 -0000	1.12
  @@ -557,16 +557,12 @@
      {
         StringBuffer answer = new StringBuffer().append("VirtualServerSocket[");
         
  -      if (!isBound())
  -         return answer.append("unbound]").toString();
  -      
  -      answer.append("local address=" + getInetAddress() +  ":" + getLocalPort());
  +      if (actualSocket == null)
  +         answer.append("unbound");
  +      else
  +         answer.append(actualSocket.toString());
         
  -      if (!isConnected())
            return answer.append("]").toString();
  -      
  -      return answer.append(", remote address=" + actualSocket.getInetAddress() +  
  -            ":" + actualSocket.getPort() + "]").toString();
      }