No commit message

iterate-ch · Jan 19, 2007 · 1473fb4 · 1473fb4
1 parent 8dedbc9
commit 1473fb4
Show file tree

Hide file tree

Showing 6 changed files with 572 additions and 483 deletions.
diff --git a/source/ch/cyberduck/core/ftp/FTPSession.java b/source/ch/cyberduck/core/ftp/FTPSession.java
@@ -108,6 +108,7 @@ public void close() {
 
     public void interrupt() {
         try {
+            super.interrupt();
             if(null == this.FTP) {
                 return;
             }
@@ -155,8 +156,8 @@ public void logReply(String reply) {
                 }
             });
             try {
-                this.FTP.connect(host.getHostname(), host.getPort(),
-                    Preferences.instance().getInteger("connection.timeout"));
+                this.FTP.setTimeout(Preferences.instance().getInteger("connection.timeout"));
+                this.FTP.connect(host.getHostname(), host.getPort());
                 if(!this.isConnected()) {
                     return;
                 }

diff --git a/source/ch/cyberduck/core/ftps/FTPSSession.java b/source/ch/cyberduck/core/ftps/FTPSSession.java
@@ -99,8 +99,8 @@ public void logReply(String reply) {
                 }
             }, this.trustManager);
             try {
-                this.FTP.connect(host.getHostname(), host.getPort(),
-                        Preferences.instance().getInteger("connection.timeout"));
+                this.FTP.setTimeout(Preferences.instance().getInteger("connection.timeout"));
+                this.FTP.connect(host.getHostname(), host.getPort());
                 if(!this.isConnected()) {
                     return;
                 }

diff --git a/source/ch/cyberduck/core/sftp/SFTPSession.java b/source/ch/cyberduck/core/sftp/SFTPSession.java
@@ -114,6 +114,7 @@ public void close() {
 
     public void interrupt() {
         try {
+            super.interrupt();
             if(null == this.SSH) {
                 return;
             }

diff --git a/source/com/enterprisedt/net/ftp/FTPClient.java b/source/com/enterprisedt/net/ftp/FTPClient.java
@@ -132,14 +132,12 @@ public FTPClient(final String encoding, final FTPMessageListener listener) {
      *
      * @param remoteHost  the remote hostname
      * @param controlPort port for control stream (use -1 for the default port)
-     * @param timeout     the length of the timeout, in milliseconds
-     *                    (pass in 0 for no timeout)
      * @throws IOException
      * @throws FTPException
      */
-    public void connect(final String remoteHost, int controlPort, int timeout)
+    public void connect(final String remoteHost, int controlPort)
             throws IOException, FTPException {
-        this.control.connect(InetAddress.getByName(remoteHost), controlPort, timeout);
+        this.control.connect(InetAddress.getByName(remoteHost), controlPort);
     }
 
     /**
@@ -204,7 +202,7 @@ public boolean isStrictReturnCodes() {
      */
     public void setTimeout(int millis) throws IOException {
         this.timeout = millis;
-        control.setTimeout(millis);
+        this.control.setTimeout(millis);
     }
 
     /**