BUG 1899: Fix NPE in PolicyManager.

Change-Id: I987530f6aef0dc8d6be677864929bf1339c8881b
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/GroupTable.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/GroupTable.java
index 4cb9cbd43dc6924b96d2e2a0caca98f7af3798f8..742d1a587c3ba0ccd2cbf837c7609dfa715e161b 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/GroupTable.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/GroupTable.java
@@ -78,14 +78,16 @@ public class GroupTable extends OfTable {
 
         HashMap<GroupId, GroupCtx> groupMap = new HashMap<>();
 
-        for (Group g : fcn.getGroup()) {
-            GroupCtx gctx = new GroupCtx(g.getGroupId());
-            groupMap.put(g.getGroupId(), gctx);
+        if (fcn.getGroup() != null) {
+            for (Group g : fcn.getGroup()) {
+                GroupCtx gctx = new GroupCtx(g.getGroupId());
+                groupMap.put(g.getGroupId(), gctx);
 
-            Buckets bs = g.getBuckets();
-            if (bs != null && bs.getBucket() != null)
-            for (Bucket b : bs.getBucket()) {
-                gctx.bucketMap.put(b.getBucketId(), new BucketCtx(b));
+                Buckets bs = g.getBuckets();
+                if (bs != null && bs.getBucket() != null)
+                for (Bucket b : bs.getBucket()) {
+                    gctx.bucketMap.put(b.getBucketId(), new BucketCtx(b));
+                }
             }
         }