mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

[246651] FTP subsystem doesn't handle disconnected situation well

Browse source
This commit is contained in:
David McKnight 2008-09-11 00:51:58 +00:00
parent c5aa96a36c
commit 564a480442
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/DownloadAndOpenJob.java
View file

@ -14,6 +14,7 @@
* Contributors: * Contributors:
* Kevin Doyle (IBM) - [194463] Use the result of _editable.download() to decide if file is to be opened * Kevin Doyle (IBM) - [194463] Use the result of _editable.download() to decide if file is to be opened
* David McKnight (IBM) - [189873] Improve remote shell editor open action with background jobs * David McKnight (IBM) - [189873] Improve remote shell editor open action with background jobs
* David McKnight (IBM) - [246651] FTP subsystem doesn't handle disconnected situation well
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.files.ui.view; package org.eclipse.rse.internal.files.ui.view;
@ -23,6 +24,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
import org.eclipse.rse.files.ui.resources.SystemUniversalTempFileListener; import org.eclipse.rse.files.ui.resources.SystemUniversalTempFileListener;
import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.files.ui.FileResources;
@ -129,10 +131,22 @@ public class DownloadAndOpenJob extends Job
try try
{ {
IFile localFile = _editable.getLocalResource(); IFile localFile = _editable.getLocalResource();
SystemUniversalTempFileListener listener = SystemUniversalTempFileListener.getListener(); ISubSystem ss = _editable.getSubSystem();
listener.addIgnoreFile(localFile);
downloadSuccessful = _editable.download(monitor);
listener.removeIgnoreFile(localFile); // if we're not connected, connect
if (!ss.isConnected()){
ss.connect(monitor, false);
}
if (ss.isConnected()){
SystemUniversalTempFileListener listener = SystemUniversalTempFileListener.getListener();
listener.addIgnoreFile(localFile);
downloadSuccessful = _editable.download(monitor);
listener.removeIgnoreFile(localFile);
}
else {
return Status.CANCEL_STATUS;
}
} }
catch (Exception e) catch (Exception e)
{ {