|
Lines 71-76
Link Here
|
| 71 |
import org.apache.commons.net.ftp.FTPFile; |
72 |
import org.apache.commons.net.ftp.FTPFile; |
| 72 |
import org.apache.commons.net.ftp.FTPReply; |
73 |
import org.apache.commons.net.ftp.FTPReply; |
| 73 |
import org.eclipse.core.runtime.IProgressMonitor; |
74 |
import org.eclipse.core.runtime.IProgressMonitor; |
|
|
75 |
import org.eclipse.core.runtime.NullProgressMonitor; |
| 74 |
import org.eclipse.core.runtime.Path; |
76 |
import org.eclipse.core.runtime.Path; |
| 75 |
import org.eclipse.rse.core.model.IPropertySet; |
77 |
import org.eclipse.rse.core.model.IPropertySet; |
| 76 |
import org.eclipse.rse.internal.services.files.ftp.parser.IFTPClientConfigFactory; |
78 |
import org.eclipse.rse.internal.services.files.ftp.parser.IFTPClientConfigFactory; |
|
Lines 562-570
Link Here
|
| 562 |
|
573 |
|
| 563 |
if (monitor!=null){ |
574 |
if (monitor!=null){ |
| 564 |
if (monitor.isCanceled()) { |
575 |
if (monitor.isCanceled()) { |
| 565 |
return false; |
576 |
throw new RemoteFileCancelledException(); |
| 566 |
} |
577 |
} |
| 567 |
} |
578 |
} |
|
|
579 |
else{ |
| 580 |
monitor = new NullProgressMonitor(); |
| 581 |
} |
| 568 |
|
582 |
|
| 569 |
if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE)) |
583 |
if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE)) |
| 570 |
{ |
584 |
{ |
