From c97ff689b65a2f8bf0dc9fb7aa4bdf441aa1024e Mon Sep 17 00:00:00 2001 From: nitinanand Date: Fri, 24 Mar 2017 18:03:14 +0530 Subject: [PATCH] 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 --- .../main/java/org/onosproject/sfc/manager/impl/SfcManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 171195e4e2..b71fec7224 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 @@ public class SfcManager implements SfcService { * 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 @@ public class SfcManager implements SfcService { Iterable 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