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

Fix 158534 - NPE in upload/download after conflict

Browse source
This commit is contained in:
Martin Oberhuber 2006-10-29 20:38:32 +00:00
parent 3bf8db48fc
commit c959f95786
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java
View file

@ -27,6 +27,7 @@ import java.util.Vector;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
@ -323,6 +324,10 @@ public class SftpFileService extends AbstractFileService implements IFileService
{ {
//TODO what to do with isBinary? //TODO what to do with isBinary?
ChannelSftp channel = null; ChannelSftp channel = null;
//Fixing bug 158534. TODO remove when bug 162688 is fixed.
if (monitor==null) {
monitor = new NullProgressMonitor();
}
try { try {
SftpProgressMonitor sftpMonitor=new MyProgressMonitor(monitor); SftpProgressMonitor sftpMonitor=new MyProgressMonitor(monitor);
int mode=ChannelSftp.OVERWRITE; int mode=ChannelSftp.OVERWRITE;

7
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java
View file

@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - Fix 158534 - NPE in upload/download after conflict
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.subsystems.files.core.servicesubsystem; package org.eclipse.rse.subsystems.files.core.servicesubsystem;
@ -21,6 +21,7 @@ import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IConnectorService;
@ -443,6 +444,10 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
*/ */
public void download(IRemoteFile file, String localpath, String encoding, IProgressMonitor monitor) public void download(IRemoteFile file, String localpath, String encoding, IProgressMonitor monitor)
{ {
//Fixing bug 158534. TODO remove when bug 162688 is fixed.
if (monitor==null) {
monitor = new NullProgressMonitor();
}
String parentPath = file.getParentPath(); String parentPath = file.getParentPath();
File localFile = new File(localpath); File localFile = new File(localpath);
try try