commit e3c43347761aee0763f7425144a3a636d4290dfa
author helenyrwu <helenwu@college.harvard.edu> Thu Aug 11 10:33:12 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Aug 11 21:42:03 2016 +0000
tree 3786a9c2be2d2215f4e55d2531908bbd6c1548f7
parent 3d71252d1c54d542af60ceffdf95a663492fd518

Fix disjoint path exceptions when backup not present

Change-Id: Ib8de79700f17a3b06e4b790064dc0c5625c77b38

core/common/src/main/java/org/onosproject/common/DefaultTopology.java

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 72780d3..5321b42 100644
--- a/core/common/src/main/java/org/onosproject/common/DefaultTopology.java
+++ b/core/common/src/main/java/org/onosproject/common/DefaultTopology.java
@@ -390,7 +390,11 @@
                 SUURBALLE.search(graph, srcV, dstV, weight, ALL_PATHS);
         ImmutableSet.Builder<DisjointPath> builder = ImmutableSet.builder();
         for (org.onlab.graph.Path<TopologyVertex, TopologyEdge> path : result.paths()) {
-            builder.add(networkDisjointPath((org.onlab.graph.DisjointPathPair<TopologyVertex, TopologyEdge>) path));
+            DisjointPath disjointPath =
+                    networkDisjointPath((org.onlab.graph.DisjointPathPair<TopologyVertex, TopologyEdge>) path);
+            if (disjointPath.backup() != null) {
+                builder.add(disjointPath);
+            }
         }
         return builder.build();
     }
@@ -421,7 +425,11 @@
                 srlg.search(graph, srcV, dstV, weight, ALL_PATHS);
         ImmutableSet.Builder<DisjointPath> builder = ImmutableSet.builder();
         for (org.onlab.graph.Path<TopologyVertex, TopologyEdge> path : result.paths()) {
-            builder.add(networkDisjointPath((org.onlab.graph.DisjointPathPair<TopologyVertex, TopologyEdge>) path));
+            DisjointPath disjointPath =
+                    networkDisjointPath((org.onlab.graph.DisjointPathPair<TopologyVertex, TopologyEdge>) path);
+            if (disjointPath.backup() != null) {
+                builder.add(disjointPath);
+            }
         }
         return builder.build();
     }