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

[162585] [FTP] fetch children cannot be canceled. -- Moved file listing to a Thread

Browse source
This commit is contained in:
Javier Montalvo Orus 2006-11-20 16:28:35 +00:00
parent 930ec544b5
commit 2da43d2f3a
1 changed files with 34 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,10 +54,7 @@ import org.apache.commons.net.ftp.FTPClientConfig;
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;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.rse.services.clientserver.FileTypeMatcher; import org.eclipse.rse.services.clientserver.FileTypeMatcher;
import org.eclipse.rse.services.clientserver.IMatcher; import org.eclipse.rse.services.clientserver.IMatcher;
import org.eclipse.rse.services.clientserver.NamePatternMatcher; import org.eclipse.rse.services.clientserver.NamePatternMatcher;
@ -65,6 +62,7 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.services.files.AbstractFileService; import org.eclipse.rse.services.files.AbstractFileService;
import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.files.IFileService;
import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.rse.services.files.RemoteFileCancelledException;
import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileIOException;
import org.eclipse.rse.services.files.RemoteFolderNotEmptyException; import org.eclipse.rse.services.files.RemoteFolderNotEmptyException;
@ -83,6 +81,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
private OutputStream _ftpLoggingOutputStream; private OutputStream _ftpLoggingOutputStream;
private Exception _exception;
/* /*
* (non-Javadoc) * (non-Javadoc)
@ -299,12 +298,12 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
if(!_ftpClient.changeWorkingDirectory(remoteParent)) if(!_ftpClient.changeWorkingDirectory(remoteParent))
{ {
return null; throw new RemoteFileIOException(new Exception(_ftpClient.getReplyString()));
} }
if(!listFiles(monitor)) if(!listFiles(monitor))
{ {
return null; throw new RemoteFileCancelledException();
} }
for (int i = 0; i < _ftpFiles.length; i++) for (int i = 0; i < _ftpFiles.length; i++)
@ -375,12 +374,12 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
if(!_ftpClient.changeWorkingDirectory(parentPath)) if(!_ftpClient.changeWorkingDirectory(parentPath))
{ {
return null; throw new RemoteFileIOException(new Exception(_ftpClient.getReplyString()));
} }
if(!listFiles(monitor)) if(!listFiles(monitor))
{ {
return null; throw new RemoteFileCancelledException();
} }
for(int i=0; i<_ftpFiles.length; i++) for(int i=0; i<_ftpFiles.length; i++)
@ -823,66 +822,60 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
} }
private boolean listFiles(IProgressMonitor monitor) throws Exception private synchronized boolean listFiles(IProgressMonitor monitor) throws Exception
{ {
boolean result = true; boolean result = true;
Job fetchJob = new Job(FTPServiceResources.FTP_File_Service_Listing_Job){ _exception = null;
protected IStatus run(IProgressMonitor monitor) {
Thread listThread = new Thread(new Runnable(){
public void run() {
try { try {
_ftpFiles = _ftpClient.listFiles(); _ftpFiles = _ftpClient.listFiles();
} catch (IOException e) { } catch (IOException e) {
return new Status(IStatus.ERROR, "org.eclipse.rse.services.files.ftp",IStatus.ERROR,e.getMessage(),e); //$NON-NLS-1$ _exception = e;
} }
return new Status(IStatus.OK,"org.eclipse.rse.services.files.ftp",IStatus.OK,FTPServiceResources.FTP_File_Service_Listing_Job_Success,null); //$NON-NLS-1$ }});
}};
IStatus fetchResult = null;
if(monitor != null) if(monitor != null)
{ {
if(!monitor.isCanceled()) if(!monitor.isCanceled())
fetchJob.schedule(); listThread.start();
else else
return false; return false;
}
else
{
fetchJob.schedule();
}
if(monitor!=null) //wait
{
while(!monitor.isCanceled() && (fetchResult = fetchJob.getResult())==null) while(!monitor.isCanceled() && listThread.isAlive())
{ {
try { try {
Thread.sleep(500); Thread.sleep(100);
} catch (InterruptedException e) {} } catch (InterruptedException e) {}
} }
if(monitor.isCanceled() && fetchJob.getState()!=Job.NONE) //evaluate result
if(monitor.isCanceled() && listThread.isAlive())
{ {
fetchJob.cancel(); Thread killThread = listThread;
listThread = null;
killThread.interrupt();
_ftpClient.completePendingCommand(); _ftpClient.completePendingCommand();
result = false;
} throw new RemoteFileIOException(_exception);
}
else
{
fetchJob.join();
fetchResult = fetchJob.getResult();
} }
if(fetchResult==null)
{
result = false;
} }
else else
{ {
if(fetchResult.getSeverity()==IStatus.ERROR) listThread.join();
if(_exception!=null)
{ {
throw new RemoteFileIOException(new Exception(fetchResult.getException())); throw new RemoteFileIOException(_exception);
} }
} }
return result; return result;