From 8f786919635e4d1f7db8d12b201c54bdd5ca2dad Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Thu, 28 Jan 2016 11:42:02 -0500 Subject: [PATCH] rcp: Bug 486745: Open traces with name conflict from cmd-line correctly Change-Id: I4cff3ef47fc52df07c7e0b4df3bab44fdc2e2344 Signed-off-by: Bernd Hufmann Reviewed-on: https://git.eclipse.org/r/65378 Reviewed-by: Patrick Tasse Reviewed-by: Hudson CI Tested-by: Patrick Tasse --- .../tracecompass/tmf/ui/project/model/TmfOpenTraceHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfOpenTraceHelper.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfOpenTraceHelper.java index 1541440878..6281b56a57 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfOpenTraceHelper.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfOpenTraceHelper.java @@ -188,7 +188,7 @@ public class TmfOpenTraceHelper { final IPath rawLocation = candidate.getRawLocation(); File file = rawLocation.toFile(); try { - file = traceFile.getCanonicalFile(); + file = file.getCanonicalFile(); } catch (IOException e) { /* just use original file path */ } -- 2.34.1