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

[Ron Sigal]

  User: rsigal  
  Date: 06/08/09 23:35:14

  Modified:    src/main/org/jboss/remoting/transport/multiplex 
                        MultiplexingManager.java
  Log:
  JBREM-574:  For SSL sockets, MultiplexingManager makes itself the HandshakeCompletedListener so that it can update the stored description of the underlying socket.
  
  Revision  Changes    Path
  1.52      +28 -12    JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/MultiplexingManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MultiplexingManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/MultiplexingManager.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -b -r1.51 -r1.52
  --- MultiplexingManager.java	23 Jul 2006 03:25:38 -0000	1.51
  +++ MultiplexingManager.java	10 Aug 2006 03:35:14 -0000	1.52
  @@ -486,6 +486,17 @@
         registerByRemoteAddress(new InetSocketAddress(socket.getInetAddress(), socket.getPort()));
         bound = true;
         connected = true;
  +      
  +      if (socket instanceof SSLSocket)
  +      {
  +//         Object o = configuration.get(Multiplex.SSL_HANDSHAKE_LISTENER);
  +//         if (o != null)
  +//         {
  +//            HandshakeCompletedListener hcl = (HandshakeCompletedListener) o;
  +//            ((SSLSocket) socket).addHandshakeCompletedListener(hcl);
  +//         }
  +         ((SSLSocket) socket).addHandshakeCompletedListener(this);
  +      }
      }
      
      
  @@ -1632,6 +1643,9 @@
    */
      public void handshakeCompleted(HandshakeCompletedEvent event)
      {
  +      description = socket.toString();
  +      System.out.println("HANDSHAKE COMPLETED: " + description);
  +      
         handshakeCompletedEvent = event;
         Object obj = configuration.get(Multiplex.SSL_HANDSHAKE_LISTENER);
         if (obj != null)
  @@ -1816,12 +1830,13 @@
            
         if (socket instanceof SSLSocket)
         {
  -         Object o = configuration.get(Multiplex.SSL_HANDSHAKE_LISTENER);
  -         if (o != null)
  -         {
  -            HandshakeCompletedListener hcl = (HandshakeCompletedListener) o;
  -            ((SSLSocket) socket).addHandshakeCompletedListener(hcl);
  -         }
  +//         Object o = configuration.get(Multiplex.SSL_HANDSHAKE_LISTENER);
  +//         if (o != null)
  +//         {
  +//            HandshakeCompletedListener hcl = (HandshakeCompletedListener) o;
  +//            ((SSLSocket) socket).addHandshakeCompletedListener(hcl);
  +//         }
  +         ((SSLSocket) socket).addHandshakeCompletedListener(this);
         }
         
         socket.setSoTimeout(timeout);
  @@ -1841,12 +1856,13 @@
            
            if (socket instanceof SSLSocket)
            {
  -            Object o = configuration.get(Multiplex.SSL_HANDSHAKE_LISTENER);
  -            if (o != null)
  -            {
  -               HandshakeCompletedListener hcl = (HandshakeCompletedListener) o;
  -               ((SSLSocket) socket).addHandshakeCompletedListener(hcl);
  -            }
  +//            Object o = configuration.get(Multiplex.SSL_HANDSHAKE_LISTENER);
  +//            if (o != null)
  +//            {
  +//               HandshakeCompletedListener hcl = (HandshakeCompletedListener) o;
  +//               ((SSLSocket) socket).addHandshakeCompletedListener(hcl);
  +//            }
  +            ((SSLSocket) socket).addHandshakeCompletedListener(this);
            }
         }
         catch (IOException e)