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

[Ron Sigal]

  User: rsigal  
  Date: 07/03/27 04:01:23

  Modified:    src/main/org/jboss/remoting/transport/multiplex  Tag:
                        remoting_2_x InputMultiplexor.java
  Log:
  JBREM-729: Doesn't count SSL exceptions toward error count.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.27.4.1  +13 -2     JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/InputMultiplexor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InputMultiplexor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/InputMultiplexor.java,v
  retrieving revision 1.27
  retrieving revision 1.27.4.1
  diff -u -b -r1.27 -r1.27.4.1
  --- InputMultiplexor.java	20 Aug 2006 08:54:30 -0000	1.27
  +++ InputMultiplexor.java	27 Mar 2007 08:01:23 -0000	1.27.4.1
  @@ -44,6 +44,8 @@
   import java.util.Map;
   import java.util.Set;
   
  +import javax.net.ssl.SSLException;
  +
   /**
    * <code>InputMultiplexor</code> is one of the key Multiplex classes, responsible for
    * demultiplexing multiple byte streams sharing a single TCP connection.  It has two
  @@ -422,8 +424,6 @@
   
            private void handleChannelException(IOException e, SelectionKey key, SocketChannel channel)
            {
  -            log.error("handleChannelException()");
  -            log.error(e);
               try
               {
                  if (!channel.isOpen())
  @@ -440,6 +440,13 @@
                     return;
                  }
   
  +               if (e instanceof SSLException)
  +               {
  +                  key.cancel();
  +                  log.error(e);
  +                  return;
  +               }
  +
                  if (++errorCount > maxErrors)
                    {
                       manager.setReadException(e);
  @@ -579,6 +586,10 @@
                  }
               }
            }
  +         catch (SSLException e)
  +         {
  +            log.debug(e.getMessage());
  +         }
            catch (EOFException e)
            {
               eof = true;