cvs commit: incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/protocol SocketProtocol.java

[adc]

adc         2004/06/27 11:29:07

  Modified:    modules/network/src/java/org/apache/geronimo/network/protocol
                        SocketProtocol.java
  Log:
  NIO bug 4854354
  
  Revision  Changes    Path
  1.14      +12 -7     
incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/protocol/SocketProtocol.java
  
  Index: SocketProtocol.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/protocol/SocketProtocol.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SocketProtocol.java       4 May 2004 03:05:36 -0000       1.13
  +++ SocketProtocol.java       27 Jun 2004 18:29:07 -0000      1.14
  @@ -265,7 +265,7 @@
               selectorManager.addInterestOps(selectionKey, 
SelectionKey.OP_WRITE);
   
           } catch (InterruptedException e) {
  -            log.debug("Communications error, closing connection: ", e);
  +            log.trace("Communications error, closing connection: ", e);
               close();
               throw new ProtocolException(e);
           }
  @@ -320,8 +320,13 @@
               log.trace("RELEASED " + sendMutex);
   
           } catch (IOException e) {
  -            log.debug("Communications error, closing connection: ", e);
  -            close();
  +            /**
  +             * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4854354
  +             */
  +            if (!"A non-blocking socket operation could not be completed 
immediately".equals(e.getMessage())) {
  +                log.warn("Communications error, closing connection: ", e);
  +                close();
  +            }
           } finally {
               log.trace("serviceWrite() done.");
           }
  @@ -409,13 +414,13 @@
               // who knows, by the time we get here,
               // the channel could have been closed.
           } catch (IOException e) {
  -            log.debug("Communications error, closing connection: ", e);
  +            log.trace("Communications error, closing connection: ", e);
               close();
           } catch (ProtocolException e) {
  -            log.debug("Communications error, closing connection: ", e);
  +            log.trace("Communications error, closing connection: ", e);
               close();
           } catch (Throwable e) {
  -            log.debug("Unhandled error, closing connection: ", e);
  +            log.trace("Unhandled error, closing connection: ", e);
               close();
           } finally {
               if (tracing) log.trace("serviceRead() done.");