commit 95d0890f8d404ae1f780277659f859718b4f66b7
author Ravi Dewangan <ravi_dewangan@comcast.com> Tue May 28 22:24:18 2019 +0000
committer Pier Luigi Ventre <pier@opennetworking.org> Wed May 29 17:25:33 2019 +0000
tree 274c53620cc32e2813d770256ce625665bd4f029
parent 2d378cdd20da495a85f45543e78abd955a0be821

topGroup checking with NULL

Change-Id: Ieea51cb6080690f814fd6230c5ea3ed1036cf9da

drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
index e6cb219..3f462b6 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
@@ -1883,6 +1883,12 @@
             // method will not be required.
             GroupKey topGroupKey = allActiveKeys.get(0).peekFirst();
             Group topGroup = groupService.getGroup(deviceId, topGroupKey);
+            // topGroup should not be null - adding guard
+            if (topGroup == null) {
+                log.warn("topGroup {} not found in GroupStore device:{}, nextId:{}",
+                         topGroupKey, deviceId, nextObjective.id());
+                return;
+            }
             int actualGroupSize = topGroup.buckets().buckets().size();
             int objGroupSize = nextObjective.next().size();
             if (actualGroupSize != objGroupSize) {