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

Throw RemoteFileCanceledException in case IFileService operations were canceled

Browse source
This commit is contained in:
Martin Oberhuber 2007-07-27 17:26:10 +00:00
parent 027ca1461a
commit a34964063b
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -336,6 +336,8 @@ public class SftpFileService extends AbstractFileService implements IFileService
} finally { } finally {
fDirChannelMutex.release(); fDirChannelMutex.release();
} }
} else {
throw new RemoteFileCancelledException();
} }
return (IHostFile[])results.toArray(new IHostFile[results.size()]); return (IHostFile[])results.toArray(new IHostFile[results.size()]);
} }
@ -607,6 +609,8 @@ public class SftpFileService extends AbstractFileService implements IFileService
} finally { } finally {
fDirChannelMutex.release(); fDirChannelMutex.release();
} }
} else {
throw new RemoteFileCancelledException();
} }
return result; return result;
} }
@ -627,6 +631,8 @@ public class SftpFileService extends AbstractFileService implements IFileService
} finally { } finally {
fDirChannelMutex.release(); fDirChannelMutex.release();
} }
} else {
throw new RemoteFileCancelledException();
} }
return result; return result;
} }
@ -945,7 +951,9 @@ public class SftpFileService extends AbstractFileService implements IFileService
Activator.trace("SftpFileService.getOutputStream " + remoteFile + " failed: " + e.toString()); //$NON-NLS-1$ //$NON-NLS-2$ Activator.trace("SftpFileService.getOutputStream " + remoteFile + " failed: " + e.toString()); //$NON-NLS-1$ //$NON-NLS-2$
throw makeSystemMessageException(e); throw makeSystemMessageException(e);
} }
if (monitor.isCanceled()) {
throw new RemoteFileCancelledException();
}
return stream; return stream;
} }
} }

3
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Mutex.java
View file

@ -69,6 +69,9 @@ public class Mutex {
if (Thread.interrupted()) { if (Thread.interrupted()) {
return false; return false;
} }
if (monitor!=null && monitor.isCanceled()) {
return false;
}
final Thread myself = Thread.currentThread(); final Thread myself = Thread.currentThread();
synchronized(fWaitQueue) { synchronized(fWaitQueue) {
if (!fLocked) { if (!fLocked) {