diff options
| author | Ian Bull | 2010-03-30 22:26:28 +0000 |
|---|---|---|
| committer | Ian Bull | 2010-03-30 22:26:28 +0000 |
| commit | 3ad938e16227692213f76b5b58571cc8549eb171 (patch) | |
| tree | ed632a00d3f30d7614f5a06bad2e8fc33f56bc1c /bundles/org.eclipse.equinox.p2.directorywatcher | |
| parent | 8ddf94526a1ff72f60b38fabfa1932c004d2d82b (diff) | |
| download | rt.equinox.p2-3ad938e16227692213f76b5b58571cc8549eb171.tar.gz rt.equinox.p2-3ad938e16227692213f76b5b58571cc8549eb171.tar.xz rt.equinox.p2-3ad938e16227692213f76b5b58571cc8549eb171.zip | |
bug 305237: [repository] Handle operation cancelled exception in execute batch
https://bugs.eclipse.org/bugs/show_bug.cgi?id=305237
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.directorywatcher')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/CachingArtifactRepository.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/CachingArtifactRepository.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/CachingArtifactRepository.java index 8d3e88a10..36bfd20b4 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/CachingArtifactRepository.java +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/CachingArtifactRepository.java @@ -264,6 +264,8 @@ public class CachingArtifactRepository implements IArtifactRepository, IFileArti public IStatus executeBatch(IRunnableWithProgress runnable, IProgressMonitor monitor) { try { runnable.run(monitor); + } catch (OperationCanceledException oce) { + return new Status(IStatus.CANCEL, Activator.ID, oce.getMessage(), oce); } catch (Exception e) { return new Status(IStatus.ERROR, Activator.ID, e.getMessage(), e); } |