commit d3ff540f3674d4d2fa064c1b30925dbb205bb7ac
author Jayasree Ghosh <jghosh@partner.ciena.com> Wed Aug 17 18:41:19 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Tue Aug 23 04:49:45 2016 +0000
tree d1c6a790c9895dede5f003e1903e7ab7de1b4ce2
parent 5808d5245e1453ec378fafc33dc6c5ff884327e7

Fix for ONOS-5152:Encoder for Disjoint Rest API with NPE:onos-1.7

Change-Id: I172e247353f7d70f6d7761e8a6be27f21b3c2684

core/api/src/main/java/org/onosproject/net/topology/AbstractPathService.java

diff --git a/core/api/src/main/java/org/onosproject/net/topology/AbstractPathService.java b/core/api/src/main/java/org/onosproject/net/topology/AbstractPathService.java
index d718d15..8b24cbb 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/AbstractPathService.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/AbstractPathService.java
@@ -239,6 +239,9 @@
             primary = path.primary();
             backup = path.backup();
         }
+        if (backup == null) {
+        return new DefaultDisjointPath(PID, (DefaultPath) edgeToEdgePath(srcLink, dstLink, primary));
+        }
         return new DefaultDisjointPath(PID, (DefaultPath) edgeToEdgePath(srcLink, dstLink, primary),
                                        (DefaultPath) edgeToEdgePath(srcLink, dstLink, backup));
     }