diff --git a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/files/importexport/files/RemoteExporter.java b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/files/importexport/files/RemoteExporter.java index 8cc10996db0..73521b02a5f 100644 --- a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/files/importexport/files/RemoteExporter.java +++ b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/files/importexport/files/RemoteExporter.java @@ -19,6 +19,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.services.clientserver.SystemEncodingUtil; import org.eclipse.rse.services.files.RemoteFileException; import org.eclipse.rse.services.files.RemoteFileSecurityException; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; @@ -87,7 +88,7 @@ class RemoteExporter { */ protected void writeFile(IFile file, IPath destinationPath) throws IOException, CoreException, RemoteFileSecurityException, RemoteFileException { IRemoteFileSubSystem rfss = RemoteFileUtility.getFileSubSystem((IHost) as400); - rfss.upload(file.getLocation().makeAbsolute().toOSString(), destinationPath.toString(), null); + rfss.upload(file.getLocation().makeAbsolute().toOSString(), SystemEncodingUtil.ENCODING_UTF_8, destinationPath.toString(), System.getProperty("file.encoding"), null); //$NON-NLS-1$ } /** diff --git a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/files/importexport/files/RemoteFileImportOperation.java b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/files/importexport/files/RemoteFileImportOperation.java index 489bd899af0..93298266473 100644 --- a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/files/importexport/files/RemoteFileImportOperation.java +++ b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/files/importexport/files/RemoteFileImportOperation.java @@ -465,7 +465,7 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation { { encoding = "Cp" + encoding.substring(2); //$NON-NLS-1$ } - rfss.download(((UniFilePlus) fileObject).remoteFile, targetResource, encoding, null); + rfss.download(((UniFilePlus) fileObject).remoteFile, targetResource.getLocation().makeAbsolute().toOSString(), encoding, null); try { // refresh workspace with just added resource targetResource.refreshLocal(IResource.DEPTH_ZERO, new SubProgressMonitor(monitor, 1, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL));