From 3d945bb4420c5bb68a5d5e3272a94784f3a2c87c Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 29 Nov 2010 08:41:29 +0000
Subject: [PATCH] fix for ftp client: suppress bad directory listing time-out

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7348 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 .../net/yacy/cora/protocol/ftp/FTPClient.java | 73 ++++++++-----------
 1 file changed, 29 insertions(+), 44 deletions(-)

diff --git a/source/net/yacy/cora/protocol/ftp/FTPClient.java b/source/net/yacy/cora/protocol/ftp/FTPClient.java
index b7e5cf209..17bf656df 100644
--- a/source/net/yacy/cora/protocol/ftp/FTPClient.java
+++ b/source/net/yacy/cora/protocol/ftp/FTPClient.java
@@ -1347,23 +1347,22 @@ public class FTPClient {
         // read file system data
         String line;
         final ArrayList<String> files = new ArrayList<String>();
-        while ((line = ClientStream.readLine()) != null) {
-            if (!line.startsWith("total ")) {
-                files.add(line);
+        try {
+            while ((line = ClientStream.readLine()) != null) {
+                if (!line.startsWith("total ")) {
+                    files.add(line);
+                }
             }
-        }
-
-        // after stream is empty we should get control completion echo
-        /*reply =*/ receive();
-
-        // boolean success = !isNotPositiveCompletion(reply);
-
-        // shutdown connection
-        ClientStream.close(); // Closing the returned InputStream will
-        closeDataSocket(); // close the associated socket.
+            // after stream is empty we should get control completion echo
+            /*reply =*/ receive();
 
-        // if (!success) throw new IOException(reply);
+            // boolean success = !isNotPositiveCompletion(reply);
 
+            // shutdown connection
+            ClientStream.close(); // Closing the returned InputStream will
+            closeDataSocket(); // close the associated socket.
+        } catch (IOException e) {
+        }
         files.trimToSize();
         return files;
     }
@@ -2518,45 +2517,32 @@ public class FTPClient {
         }
     }
 
-    public StringBuilder dirhtml(String remotePath) {
+    public StringBuilder dirhtml(String remotePath) throws IOException {
         // returns a directory listing using an existing connection
-        try {
             if (isFolder(remotePath) && '/' != remotePath.charAt(remotePath.length()-1)) {
                 remotePath += '/';
             }
+            String pwd = pwd();
             final List<String> list = list(remotePath, true);
-            if (remotesystem == null) {
-                sys();
-            }
+            if (remotesystem == null) try {sys();} catch (IOException e) {}
             final String base = "ftp://" + ((account.equals("anonymous")) ? "" : (account + ":" + password + "@"))
-                    + host + ((port == 21) ? "" : (":" + port)) + ((remotePath.length() > 0 && remotePath.charAt(0) == '/') ? "" : pwd() + "/")
+                    + host + ((port == 21) ? "" : (":" + port)) + ((remotePath.length() > 0 && remotePath.charAt(0) == '/') ? "" : pwd + "/")
                     + remotePath;
 
             return dirhtml(base, remotemessage, remotegreeting, remotesystem, list, true);
-        } catch (final java.security.AccessControlException e) {
-            return null;
-        } catch (final IOException e) {
-            return null;
-        }
     }
 
     public static StringBuilder dirhtml(
             final String host, final int port, final String remotePath,
-            final String account, final String password) {
+            final String account, final String password) throws IOException {
         // opens a new connection and returns a directory listing as html
-        try {
-            final FTPClient c = new FTPClient();
-            c.open(host, port);
-            c.login(account, password);
-            c.sys();
-            final StringBuilder page = c.dirhtml(remotePath);
-            c.quit();
-            return page;
-        } catch (final java.security.AccessControlException e) {
-            return null;
-        } catch (final IOException e) {
-            return null;
-        }
+        final FTPClient c = new FTPClient();
+        c.open(host, port);
+        c.login(account, password);
+        c.sys();
+        final StringBuilder page = c.dirhtml(remotePath);
+        c.quit();
+        return page;
     }
 
     public static StringBuilder dirhtml(
@@ -2619,12 +2605,11 @@ public class FTPClient {
         dir(host, remotePath, "anonymous", "anomic");
     }
 
-    public static void dirAnonymousHtml(final String host, final int port, final String remotePath,
-            final String htmloutfile) {
-        final StringBuilder page = dirhtml(host, port, remotePath, "anonymous", "anomic");
-        final File file = new File(htmloutfile);
-        FileOutputStream fos;
+    public static void dirAnonymousHtml(final String host, final int port, final String remotePath, final String htmloutfile) {
         try {
+            final StringBuilder page = dirhtml(host, port, remotePath, "anonymous", "anomic");
+            final File file = new File(htmloutfile);
+            FileOutputStream fos;
             fos = new FileOutputStream(file);
             fos.write(page.toString().getBytes());
             fos.close();