mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 12:16:13 +02:00
Code Issues Projects Releases Wiki Activity

ONOS-7490 Fixed NPE in Suurballe graph search.

Browse Source 
Change-Id: Ib84e788988961e3802b8a09b8702df1f75380ae3
This commit is contained in:
Thomas Vachuska 2018-03-19 15:21:50 -07:00
parent 3516f0682b
commit 3702f9bdfd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/misc/src/main/java/org/onlab/graph/SuurballeGraphSearch.java
View File

@ -69,8 +69,10 @@ public class SuurballeGraphSearch<V extends Vertex, E extends Edge<V>> extends D
public Weight weight(E edge) {
return edge instanceof ReverseEdge ?
weightf.getInitialWeight() :
weightf.weight(edge).merge(firstDijkstra.cost(edge.src()))
.subtract(firstDijkstra.cost(edge.dst()));
(weightf.weight(edge).isNegative() ?
new ScalarWeight(-1.0) :
weightf.weight(edge).merge(firstDijkstra.cost(edge.src()))
.subtract(firstDijkstra.cost(edge.dst())));
}
@Override