Attachment #73989 for bug #191048

Lines 28-33 Link Here

(-)src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.java (+1 lines)
28	public static String FTP_File_Service_Monitor_Format;	28	public static String FTP_File_Service_Monitor_Format;
29	public static String FTP_File_Service_Name;	29	public static String FTP_File_Service_Name;
30	public static String FTP_File_Service_Description;	30	public static String FTP_File_Service_Description;
		31	public static String FTPService_FTP_File_Service_Not_Found;
31		32
32	static {	33	static {
33	// load message values from bundle file	34	// load message values from bundle file

Lines 23-26 Link Here

(-)src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.properties (+1 lines)
23	FTP_File_Service_Copy_Not_Supported=FTP copy not supported, use move instead	23	FTP_File_Service_Copy_Not_Supported=FTP copy not supported, use move instead
24	FTP_File_Service_Listing_Job=Listing files...	24	FTP_File_Service_Listing_Job=Listing files...
25	FTP_File_Service_Listing_Job_Success=Success	25	FTP_File_Service_Listing_Job_Success=Success
		26	FTPService_FTP_File_Service_Not_Found=File not found
26	FTP_File_Service_Monitor_Format={0,number,integer} KB of {1,number,integer} KB complete ({2,number,percent})	27	FTP_File_Service_Monitor_Format={0,number,integer} KB of {1,number,integer} KB complete ({2,number,percent})

Lines 674-679 Link Here

(-)src/org/eclipse/rse/internal/services/files/ftp/FTPService.java (-2 / +11 lines)
674		674
675	IHostFile remoteHostFile = getFile(remoteParent,remoteFile,null);	675	IHostFile remoteHostFile = getFile(remoteParent,remoteFile,null);
676		676
		677	if(remoteHostFile == null)
		678	{
		679	return false;
		680	}
		681
		682	if(!remoteHostFile.exists())
		683	{
		684	throw new RemoteFileIOException(new Exception(FTPServiceResources.FTPService_FTP_File_Service_Not_Found));
		685	}
		686
677	if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE))	687	if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE))
678	{	688	{
679	try	689	try
Lines 681-687 Link Here
681	FTPClient ftpClient = getFTPClient();	691	FTPClient ftpClient = getFTPClient();
682		692
683	MyProgressMonitor progressMonitor = new MyProgressMonitor(monitor);	693	MyProgressMonitor progressMonitor = new MyProgressMonitor(monitor);
684	//IHostFile remoteHostFile = null;
685	OutputStream output = null;	694	OutputStream output = null;
686	InputStream input = null;	695	InputStream input = null;
687		696
Lines 700-706 Link Here
700	output = new FileOutputStream(localFile);	709	output = new FileOutputStream(localFile);
701	input = ftpClient.retrieveFileStream(remoteFile);	710	input = ftpClient.retrieveFileStream(remoteFile);
702		711
703	if(remoteHostFile != null && input != null)	712	if(input != null)
704	{	713	{
705	progressMonitor.init(0, remoteFile, localFile.getName(), remoteHostFile.getSize());	714	progressMonitor.init(0, remoteFile, localFile.getName(), remoteHostFile.getSize());
706	byte[] buffer = new byte[4096];	715	byte[] buffer = new byte[4096];

Return to bug 191048