| commit | 2c5dad12eb7c912f8e1bc5aa2fc476df18cce9c3 | [log] [tgz] |
|---|---|---|
| author | Geneviève Bastien <gbastien+lttng@versatic.net> | Wed Apr 19 15:42:18 2017 -0400 |
| committer | Genevieve Bastien <gbastien+lttng@versatic.net> | Fri Apr 21 10:23:43 2017 -0400 |
| tree | 55c8e6dc37cea114cefd73b91eee93ceaf686e60 | |
| parent | 276c2a06228366e4f6870908cb151c3d273c668f [diff] |
critical path: Fix condition that caused infinite loop Change-Id: Ic52e2c8849fd00e543e47fe1d8ee4a87afd23ef3 Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net> Reviewed-on: https://git.eclipse.org/r/95316 Reviewed-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com> Tested-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com> Reviewed-by: Hudson CI
diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathAlgorithmBounded.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathAlgorithmBounded.java index ce5714b..e32e674 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathAlgorithmBounded.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathAlgorithmBounded.java
@@ -250,8 +250,8 @@ TmfEdge incomingEdge = vertexFrom.getEdge(EdgeDirection.INCOMING_HORIZONTAL_EDGE); if (inVerticalEdge != null && (incomingEdge == null || - incomingEdge.getType() != TmfEdge.EdgeType.BLOCKED || - incomingEdge.getType() != TmfEdge.EdgeType.NETWORK)) { + (incomingEdge.getType() != TmfEdge.EdgeType.BLOCKED && + incomingEdge.getType() != TmfEdge.EdgeType.NETWORK))) { stack.push(vertexFrom); } if (incomingEdge != null) {