From: Alexandre Montplaisir Date: Tue, 21 Jan 2014 19:58:02 +0000 (-0500) Subject: tmf: Fix usage of readNode() method in HistoryTree X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=83c31d28bda049737d25cad9f0186a742b3bde5f;p=deliverable%2Ftracecompass.git tmf: Fix usage of readNode() method in HistoryTree Small fix to 726106b, the optimization to not look into the branch in memory (when looking for a HTNode) should only be done when we know the node is not in memory. The general case should use the method from HistoryTree itself. Change-Id: I3ce114f7f84f14f2dc892c400ab6aa768bab18fc Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/20902 Tested-by: Hudson CI --- diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTree.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTree.java index 7f00e24877..de3bed3f62 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTree.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTree.java @@ -612,7 +612,7 @@ public class HistoryTree { if (currentNode.isDone()) { return treeIO.readNode(potentialNextSeqNb); } - return treeIO.readNode(potentialNextSeqNb); + return readNode(potentialNextSeqNb); } /**