mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-15 01:11:30 +02:00
Code Issues Projects Releases Wiki Activity

Fix NPE when there's no secondary path.

Browse Source 
Change-Id: I3bb8eeb2abf140d44cf4dc7186cf1bf316c23f70
This commit is contained in:
Yuta HIGUCHI 2016-08-08 11:52:52 -07:00 committed by Gerrit Code Review
parent 6a1ee2d82b
commit c3d69f52e5
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/src/main/java/org/onosproject/net/DisjointPath.java
View File

@ -43,7 +43,7 @@ public interface DisjointPath extends Path {
/** /**
* Gets secondary path. * Gets secondary path.
* *
* @return secondary path * @return secondary path, or null if there is no secondary path available.
*/ */
Path backup(); Path backup();
} }

6
core/common/src/main/java/org/onosproject/common/DefaultTopology.java
View File

@ -482,6 +482,12 @@ public class DefaultTopology extends AbstractModel implements Topology {
} }
private DisjointPath networkDisjointPath(DisjointPathPair<TopologyVertex, TopologyEdge> path) { private DisjointPath networkDisjointPath(DisjointPathPair<TopologyVertex, TopologyEdge> path) {
if (!path.hasBackup()) {
// There was no secondary path available.
return new DefaultDisjointPath(CORE_PROVIDER_ID,
(DefaultPath) networkPath(path.primary()),
null);
}
return new DefaultDisjointPath(CORE_PROVIDER_ID, return new DefaultDisjointPath(CORE_PROVIDER_ID,
(DefaultPath) networkPath(path.primary()), (DefaultPath) networkPath(path.primary()),
(DefaultPath) networkPath(path.secondary())); (DefaultPath) networkPath(path.secondary()));

2
utils/misc/src/main/java/org/onlab/graph/DisjointPathPair.java
View File

@ -66,7 +66,7 @@ public class DisjointPathPair<V extends Vertex, E extends Edge<V>> implements Pa
/** /**
* Returns the secondary path. * Returns the secondary path.
* *
* @return primary path * @return secondary path, or null if there is no secondary path available.
*/ */
public Path<V, E> secondary() { public Path<V, E> secondary() {
return secondary; return secondary;