Changeset 232

Timestamp:

11/11/02 18:17:51 (20 years ago)

Author:

piso

Message:

getArticle(): support read timeout, one retry.

File:

• trunk/j/src/org/armedbear/j/mail/NntpSession.java (modified) (5 diffs)

trunk/j/src/org/armedbear/j/mail/NntpSession.java

@@ -3 +3 @@
  *
  * Copyright (C) 2000-2002 Peter Graves
- * $Id: NntpSession.java,v 1.3 2002-10-02 18:00:46 piso Exp $
+ * $Id: NntpSession.java,v 1.4 2002-11-11 18:17:51 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -27 +27 @@
 import java.io.OutputStreamWriter;
 import java.net.Socket;
+import java.net.SocketException;
 import java.util.StringTokenizer;
 import org.armedbear.j.Debug;
@@ -98 +99 @@
 
     public String getArticle(int articleNumber, ProgressNotifier progressNotifier)
+    {
+        if (socket == null)
+            return _getArticle(articleNumber, progressNotifier);
+
+        // Existing connection.
+        int timeout =
+            Editor.preferences().getIntegerProperty(Property.NNTP_READ_TIMEOUT);
+        try {
+            socket.setSoTimeout(timeout);
+        }
+        catch (SocketException e) {
+            Log.error(e);
+        }
+        String s = _getArticle(articleNumber, progressNotifier);
+        if (s != null)
+            return s;
+        if (progressNotifier != null && progressNotifier.cancelled())
+            return null;
+
+        if (timeout > 0) {
+            Log.debug("reconnecting ...");
+            disconnect();
+            return _getArticle(articleNumber, progressNotifier);
+        }
+
+        return null;
+    }
+
+    private String _getArticle(int articleNumber, ProgressNotifier progressNotifier)
     {
         writeLine("ARTICLE ".concat(String.valueOf(articleNumber)));
@@ -163 +193 @@
     public void disconnect()
     {
-        Log.debug("disconnecting...");
-        writeLine("QUIT");
-        readLine();
+        if (socket != null) {
+            writeLine("QUIT");
+            readLine();
+        }
         abort();
     }
 
-    private void abort()
+    public void abort()
     {
         if (socket != null) {
@@ -197 +228 @@
         Debug.assertTrue(token.equals("211"));
         count = Integer.parseInt(st.nextToken());
-        Log.debug("count = " + count);
         first = Integer.parseInt(st.nextToken());
-        Log.debug("first = " + first);
         last = Integer.parseInt(st.nextToken());
-        Log.debug("last = " + last);
         return true;
     }