X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=elanmanager%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetvirt%2Felan%2Fl2gw%2Fha%2Fcommands%2FLocalMcastCmd.java;fp=elanmanager%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetvirt%2Felan%2Fl2gw%2Fha%2Fcommands%2FLocalMcastCmd.java;h=0695d5d18ce826fcb225d8d5a5284e27ccc52591;hb=cf1ea9172b94fc17e45391b62bf4ca24ac5c5fe0;hp=23a7600881c3e2bb2ce26556805adcb0dfedf8db;hpb=84a7d0a360f0d5f9b588e269840a92158d1be7d2;p=netvirt.git

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java
index 23a7600881..0695d5d18c 100644
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java
@@ -35,8 +35,8 @@ public class LocalMcastCmd
     @Override
     @Nullable
     public List<LocalMcastMacs> getData(HwvtepGlobalAugmentation node) {
-        if (node != null) {
-            return node.getLocalMcastMacs();
+        if (node != null && node.getLocalMcastMacs() != null) {
+            return new ArrayList<LocalMcastMacs>(node.getLocalMcastMacs().values());
         }
         return null;
     }