Attachment 74938 Details for Bug 198182 – Patch creating a NullProgressMonitor when the passed monitor is null

[patch] Patch creating a NullProgressMonitor when the passed monitor is null

patch.txt (text/plain), 1.28 KB, created by Javier Montalvo Orús

on 2007-07-30 11:34:18 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Javier Montalvo Orús

Created: 2007-07-30 11:34:18 EDT

Size: 1.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.files.ftp
>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.26
>diff -u -r1.26 FTPService.java
>--- src/org/eclipse/rse/internal/services/files/ftp/FTPService.java	25 Jul 2007 17:44:51 -0000	1.26
>+++ src/org/eclipse/rse/internal/services/files/ftp/FTPService.java	30 Jul 2007 15:30:33 -0000
>@@ -71,6 +72,7 @@
> import org.apache.commons.net.ftp.FTPFile;
> import org.apache.commons.net.ftp.FTPReply;
> import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.core.runtime.Path;
> import org.eclipse.rse.core.model.IPropertySet;
> import org.eclipse.rse.internal.services.files.ftp.parser.IFTPClientConfigFactory;
>@@ -562,9 +573,12 @@
> 		
> 		if (monitor!=null){
> 			if (monitor.isCanceled()) {
>-				return false;
>+				throw new RemoteFileCancelledException();
> 			}	
> 		}
>+		else{
>+				monitor = new NullProgressMonitor();
>+		}
> 		
> 		if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE))
> 		{

Flags:

mober.at+eclipse: iplog-

Actions: View | Diff

Attachments on bug 198182: 74938