commit 98a88ab78eadfab6fa3c0500936d21d5f25fce23
author Shashikanth VH <shashikanth.vh@huawei.com> Fri Feb 12 15:03:37 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Thu Feb 18 09:19:25 2016 +0000
tree d34f404a053fbc11849540ea2d8dca9946e59287
parent 4f1f08b91078f6c1b41e431bcd2d8a18c808b13c

Exception fix.

Change-Id: I238bc6f1e27c8f5211bd542b70a167014d9dc8a3

core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java b/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java
index 8347ee3..08071ec 100644
--- a/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java
+++ b/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java
@@ -277,8 +277,14 @@
 
     // Produces a direct edge-to-edge path.
     private DisjointPath edgeToEdgePathD(EdgeLink srcLink, EdgeLink dstLink, DisjointPath path) {
-        return new DefaultDisjointPath(PID, (DefaultPath) edgeToEdgePath(srcLink, dstLink, path.primary()),
-                                       (DefaultPath) edgeToEdgePath(srcLink, dstLink, path.backup()));
+        Path primary = null;
+        Path backup = null;
+        if (path != null) {
+            primary = path.primary();
+            backup = path.backup();
+        }
+        return new DefaultDisjointPath(PID, (DefaultPath) edgeToEdgePath(srcLink, dstLink, primary),
+                                       (DefaultPath) edgeToEdgePath(srcLink, dstLink, backup));
     }