fix to ftp client

pull/1/head
Michael Peter Christen 13 years ago
parent 5105256927
commit 61a1d32356

@ -71,6 +71,7 @@ import java.util.regex.Pattern;
import net.yacy.cora.document.UTF8; import net.yacy.cora.document.UTF8;
import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.Domains;
import net.yacy.kelondro.logging.Log;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -2041,9 +2042,17 @@ public class FTPClient {
*/ */
private void createDataSocket() throws IOException { private void createDataSocket() throws IOException {
if (isPassive()) { if (isPassive()) {
createPassiveDataPort(); try {
createPassiveDataPort();
} catch (IOException e) {
createActiveDataPort();
}
} else { } else {
createActiveDataPort(); try {
createActiveDataPort();
} catch (IOException e) {
createPassiveDataPort();
}
} }
} }
@ -2554,7 +2563,7 @@ public class FTPClient {
try { try {
list = ftpClient.list(path, true); list = ftpClient.list(path, true);
} catch (final IOException e) { } catch (final IOException e) {
//e.printStackTrace(); Log.logException(e);
return; return;
} }
if (!path.endsWith("/")) path += "/"; if (!path.endsWith("/")) path += "/";

Loading…
Cancel
Save