commit c97ff689b65a2f8bf0dc9fb7aa4bdf441aa1024e
author nitinanand <nitin.anand@samsung.com> Fri Mar 24 18:03:14 2017 +0530
committer Ray Milkey <ray@onlab.us> Tue Mar 28 01:45:38 2017 +0000
tree 75edf92f0f731817662ddfcf53204951d95e4ee7
parent b28d5dd54491fd6299577a5180075c39592f96de

fix for JIRA issue ONOS-6161.Possible null pointer reference on portchain-list object in file 'SfcManager.java' at line no 394

Change-Id: I5c01c8c19b67b31005ddd892419d0aedfe262e8c

apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/manager/impl/SfcManager.java

diff --git a/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/manager/impl/SfcManager.java b/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/manager/impl/SfcManager.java
index 171195e..b71fec7 100644
--- a/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/manager/impl/SfcManager.java
+++ b/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/manager/impl/SfcManager.java
@@ -379,7 +379,7 @@
          * Find the port chain for the received packet.
          *
          * @param fiveTuple five tuple info from the packet
-         * @return portChainId id of port chain
+         * @return portChainId id of port chain, null if portChain is not found
          */
         private PortChainId findPortChainFromFiveTuple(FiveTuple fiveTuple) {
 
@@ -388,6 +388,7 @@
             Iterable<PortChain> portChains = portChainService.getPortChains();
             if (portChains == null) {
                 log.error("Could not retrive port chain list");
+                return null;
             }
 
             // Identify the port chain to which the packet belongs