| commit | c3d69f52e579da322ef1fe7a26a463fda3b7323f | [log] [tgz] |
|---|---|---|
| author | Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> | Mon Aug 08 11:52:52 2016 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Mon Aug 08 23:50:40 2016 +0000 |
| tree | 904c53cac244e4d0d4d921a7cff2a44fc0d3cabc | |
| parent | 6a1ee2d82b27a3df6fdd0b2e600d6a6e3322b9b3 [diff] [blame] |
Fix NPE when there's no secondary path. Change-Id: I3bb8eeb2abf140d44cf4dc7186cf1bf316c23f70
diff --git a/core/common/src/main/java/org/onosproject/common/DefaultTopology.java b/core/common/src/main/java/org/onosproject/common/DefaultTopology.java index 8c4fbc8..72780d3 100644 --- a/core/common/src/main/java/org/onosproject/common/DefaultTopology.java +++ b/core/common/src/main/java/org/onosproject/common/DefaultTopology.java
@@ -482,6 +482,12 @@ } 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, (DefaultPath) networkPath(path.primary()), (DefaultPath) networkPath(path.secondary()));