From 7d9998c0f9f5b200189388e39c164c8df16eac51 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Genevi=C3=A8ve=20Bastien?= Date: Mon, 13 Jun 2016 14:45:41 -0400 Subject: [PATCH] tmf: bug 496031 Get the synchronization formula from the original trace MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The synchronize traces handler should get the formula from the original trace's host ID, not the new one, since the host ID falls back to the trace name and the new name is different than the original one. Change-Id: Id4af62b64df4f0b6d042a19e12c04b7e3c060176 Signed-off-by: Geneviève Bastien Reviewed-on: https://git.eclipse.org/r/75179 Reviewed-by: Hudson CI Reviewed-by: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- .../tmf/ui/project/handlers/SynchronizeTracesHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/SynchronizeTracesHandler.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/SynchronizeTracesHandler.java index 6cd37a42bc..125ba1d8ab 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/SynchronizeTracesHandler.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/SynchronizeTracesHandler.java @@ -225,7 +225,7 @@ public class SynchronizeTracesHandler extends AbstractHandler { Activator.getDefault().logError(String.format(Messages.SynchronizeTracesHandler_ErrorSynchingForTrace, exp.getName(), traceel.getName()), e); TraceUtils.displayErrorMsg(Messages.SynchronizeTracesHandler_Title, Messages.SynchronizeTracesHandler_Error + CR + CR + e.getMessage()); } - trace.setTimestampTransform(syncAlgo.getTimestampTransform(trace)); + trace.setTimestampTransform(syncAlgo.getTimestampTransform(expTrace)); TmfTraceManager.refreshSupplementaryFiles(trace); trace.dispose(); -- 2.34.1