### Eclipse Workspace Patch 1.0 #P org.eclipse.rse.services.files.ftp Index: src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.java =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.java,v retrieving revision 1.2 diff -u -r1.2 FTPServiceResources.java --- src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.java 15 Feb 2007 17:56:28 -0000 1.2 +++ src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.java 17 Jul 2007 19:08:37 -0000 @@ -28,6 +28,7 @@ public static String FTP_File_Service_Monitor_Format; public static String FTP_File_Service_Name; public static String FTP_File_Service_Description; + public static String FTPService_FTP_File_Service_Not_Found; static { // load message values from bundle file Index: src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.properties =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.properties,v retrieving revision 1.2 diff -u -r1.2 FTPServiceResources.properties --- src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.properties 15 Feb 2007 17:56:28 -0000 1.2 +++ src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.properties 17 Jul 2007 19:08:37 -0000 @@ -23,4 +23,5 @@ FTP_File_Service_Copy_Not_Supported=FTP copy not supported, use move instead FTP_File_Service_Listing_Job=Listing files... FTP_File_Service_Listing_Job_Success=Success +FTPService_FTP_File_Service_Not_Found=File not found FTP_File_Service_Monitor_Format={0,number,integer} KB of {1,number,integer} KB complete ({2,number,percent}) Index: src/org/eclipse/rse/internal/services/files/ftp/FTPService.java =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java,v retrieving revision 1.24 diff -u -r1.24 FTPService.java --- src/org/eclipse/rse/internal/services/files/ftp/FTPService.java 17 Jul 2007 15:53:12 -0000 1.24 +++ src/org/eclipse/rse/internal/services/files/ftp/FTPService.java 17 Jul 2007 19:08:37 -0000 @@ -674,6 +674,16 @@ IHostFile remoteHostFile = getFile(remoteParent,remoteFile,null); + if(remoteHostFile == null) + { + return false; + } + + if(!remoteHostFile.exists()) + { + throw new RemoteFileIOException(new Exception(FTPServiceResources.FTPService_FTP_File_Service_Not_Found)); + } + if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE)) { try @@ -681,7 +691,6 @@ FTPClient ftpClient = getFTPClient(); MyProgressMonitor progressMonitor = new MyProgressMonitor(monitor); - //IHostFile remoteHostFile = null; OutputStream output = null; InputStream input = null; @@ -700,7 +709,7 @@ output = new FileOutputStream(localFile); input = ftpClient.retrieveFileStream(remoteFile); - if(remoteHostFile != null && input != null) + if(input != null) { progressMonitor.init(0, remoteFile, localFile.getName(), remoteHostFile.getSize()); byte[] buffer = new byte[4096];