From b21bec338873e8593f9a4064e320977b19b21ae0 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 17 Aug 2006 21:18:13 +0000
Subject: [PATCH] Fix bug 154298 - copy&paste on sftp, and improve error
 messages

---
 .../services/ssh/files/SftpFileService.java   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java
index b6045a64169..23966b05097 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java
+++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java
@@ -149,11 +149,17 @@ public class SftpFileService extends AbstractFileService implements IFileService
 			return (SystemMessageException)e;
 		}
 		else if (e instanceof SftpException) {
+			//Some extra handling to keep Sftp messages
 			//TODO more user-friendly messages for more Sftp exception types
-			int id = ((SftpException)e).id;
-			if (id == ChannelSftp.SSH_FX_PERMISSION_DENIED) {
-				return new RemoteFileSecurityException(e);
+			SystemMessageException messageException;
+			SftpException sftpe = (SftpException)e;
+			if (sftpe.id == ChannelSftp.SSH_FX_PERMISSION_DENIED) {
+				messageException = new RemoteFileSecurityException(e);
+			} else {
+				messageException = new RemoteFileIOException(e);
 			}
+			messageException.getSystemMessage().makeSubstitution("Sftp: "+sftpe.toString());
+			return messageException;
 		}
 		return new RemoteFileIOException(e);
 	}
@@ -171,7 +177,12 @@ public class SftpFileService extends AbstractFileService implements IFileService
 				Activator.trace("SftpFileService.getFile done"); //$NON-NLS-1$
 			} catch(Exception e) {
 				Activator.trace("SftpFileService.getFile failed: "+e.toString()); //$NON-NLS-1$
-				throw makeSystemMessageException(e);
+				if ( (e instanceof SftpException) && ((SftpException)e).id==ChannelSftp.SSH_FX_NO_SUCH_FILE) {
+					//We MUST NOT throw an exception here. API requires that an empty IHostFile
+					//is returned in this case.
+				} else {
+					throw makeSystemMessageException(e);
+				}
 			} finally {
 				fDirChannelMutex.release();
 			}