mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 21:15:23 +02:00
Code Issues Wiki Activity

[243921] FTP subsystem timeout causes error when expanding folders

Browse source
This commit is contained in:
David McKnight 2008-08-15 16:30:13 +00:00
parent 4ec2655237
commit 256ae988c9
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java
View file

@ -79,6 +79,7 @@
* Martin Oberhuber (Wind River) - [235463][ftp][dstore] Incorrect case sensitivity reported on windows-remote * Martin Oberhuber (Wind River) - [235463][ftp][dstore] Incorrect case sensitivity reported on windows-remote
* Martin Oberhuber (Wind River) - [235360][ftp][ssh][local] Return proper "Root" IHostFile * Martin Oberhuber (Wind River) - [235360][ftp][ssh][local] Return proper "Root" IHostFile
* Martin Oberhuber (Wind River) - [240738][ftp] Incorrect behavior on getFile for non-existing folder * Martin Oberhuber (Wind River) - [240738][ftp] Incorrect behavior on getFile for non-existing folder
* David McKnight (IBM) - [243921] FTP subsystem timeout causes error when expanding folders
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.services.files.ftp; package org.eclipse.rse.internal.services.files.ftp;
@ -102,6 +103,7 @@ import java.util.Map;
import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPClientConfig; import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPConnectionClosedException;
import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPReply; import org.apache.commons.net.ftp.FTPReply;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
@ -678,8 +680,19 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil
{ {
boolean isConnected = false; boolean isConnected = false;
if(_ftpClient!=null) { if(_ftpClient!=null) {
isConnected = _ftpClient.isConnected(); isConnected = _ftpClient.isConnected();
if (isConnected){ // make sure that there hasn't been a timeout
try {
_ftpClient.noop();
}
catch (FTPConnectionClosedException e){
return false;
}
catch (IOException e2){
return false;
}
}
} }
return isConnected; return isConnected;