From 3ad938e16227692213f76b5b58571cc8549eb171 Mon Sep 17 00:00:00 2001
From: Ian Bull
Date: Tue, 30 Mar 2010 22:26:28 +0000
Subject: bug 305237: [repository] Handle operation cancelled exception in
 execute batch https://bugs.eclipse.org/bugs/show_bug.cgi?id=305237

---
 .../provisional/p2/directorywatcher/CachingArtifactRepository.java      | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bundles/org.eclipse.equinox.p2.directorywatcher')

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);
 		}
-- 
cgit v1.2.3