Checked this in 2.1. Not sure if such a minor change should have been sent
to dev list for review.
Sending it now for you review. Feel free to improve or rollback if there are
some issues with it.

Harmeet

-----------------------------------------------------------


hbedi       2003/01/18 12:07:54

  Modified:    src/java/org/apache/james/nntpserver Tag: branch_2_1_fcs
                        NNTPHandler.java
  Log:
  removed java.net.Socket::isClosed API. Breaks JDK 1.3 compatibility

  Revision  Changes    Path
  No                   revision


  No                   revision


  1.25.4.3  +6 -3
jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandler.java

  Index: NNTPHandler.java
  ===================================================================
  RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandler.jav
a,v
  retrieving revision 1.25.4.2
  retrieving revision 1.25.4.3
  diff -u -r1.25.4.2 -r1.25.4.3
  --- NNTPHandler.java 10 Jan 2003 21:28:49 -0000 1.25.4.2
  +++ NNTPHandler.java 18 Jan 2003 20:07:53 -0000 1.25.4.3
  @@ -361,10 +361,13 @@

               getLogger().info("Connection closed");
           } catch (Exception e) {
  -            if (!(socket == null || socket.isClosed())) {
  +            // unexpected error. try to send quit msg.
  +            // this may fail if socket has been closed by peer.
  +            try {
                   doQUIT(null);
  -                getLogger().error( "Exception during connection:" +
e.getMessage(), e );
  -            }
  +            } catch(Throwable t) { }
  +
  +            getLogger().error( "Exception during connection:" +
e.getMessage(), e );
           } finally {
               resetHandler();
           }



--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to