The OperationCanceledException is now caught gracefully.
Change-Id: I2da2fd00e50b14d3a215aa2389ea241e51fb698f
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/74117
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
/*******************************************************************************
/*******************************************************************************
- * Copyright (c) 2015 Ericsson
+ * Copyright (c) 2015, 2016 Ericsson
*
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License v1.0 which
*
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License v1.0 which
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
try {
doRun(monitor);
setStatus(Status.OK_STATUS);
try {
doRun(monitor);
setStatus(Status.OK_STATUS);
- } catch (InterruptedException e) {
+ } catch (InterruptedException | OperationCanceledException e) {
setStatus(Status.CANCEL_STATUS);
throw e;
} catch (Exception e) {
setStatus(Status.CANCEL_STATUS);
throw e;
} catch (Exception e) {