From 1a3ec229a4765cdc7a68bf7fcabb74db8c8a92ce Mon Sep 17 00:00:00 2001 From: Patrick Tasse Date: Tue, 31 May 2016 16:46:13 -0400 Subject: [PATCH] tmf: Bug 495067: Canceling remote import shows Internal error dialog The OperationCanceledException is now caught gracefully. Change-Id: I2da2fd00e50b14d3a215aa2389ea241e51fb698f Signed-off-by: Patrick Tasse Reviewed-on: https://git.eclipse.org/r/74117 Reviewed-by: Hudson CI Reviewed-by: Matthew Khouzam --- .../ui/wizards/fetch/model/RemoteImportTracesOperation.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tmf/org.eclipse.tracecompass.tmf.remote.ui/src/org/eclipse/tracecompass/internal/tmf/remote/ui/wizards/fetch/model/RemoteImportTracesOperation.java b/tmf/org.eclipse.tracecompass.tmf.remote.ui/src/org/eclipse/tracecompass/internal/tmf/remote/ui/wizards/fetch/model/RemoteImportTracesOperation.java index 053c458663..7cfe7ede9a 100644 --- a/tmf/org.eclipse.tracecompass.tmf.remote.ui/src/org/eclipse/tracecompass/internal/tmf/remote/ui/wizards/fetch/model/RemoteImportTracesOperation.java +++ b/tmf/org.eclipse.tracecompass.tmf.remote.ui/src/org/eclipse/tracecompass/internal/tmf/remote/ui/wizards/fetch/model/RemoteImportTracesOperation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * 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 @@ -38,6 +38,7 @@ import org.eclipse.core.runtime.IPath; 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; @@ -132,7 +133,7 @@ public class RemoteImportTracesOperation extends TmfWorkspaceModifyOperation { try { doRun(monitor); setStatus(Status.OK_STATUS); - } catch (InterruptedException e) { + } catch (InterruptedException | OperationCanceledException e) { setStatus(Status.CANCEL_STATUS); throw e; } catch (Exception e) { -- 2.34.1