rcp: Bug 486745: Open traces with name conflict from cmd-line correctly

Change-Id: I4cff3ef47fc52df07c7e0b4df3bab44fdc2e2344
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/65378
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-by: Hudson CI
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>

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 1541440878402d6e6fa21018de7c7f01a879dc5e..6281b56a57b43a04a36c48732f73757fcbfc1f2a 100644 (file)
--- 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 */
             }