Merge "CORD_1598 - The Egress VLAN is not configurable in the IGMP proxy outbound packets"
diff --git a/src/main/java/org/opencord/igmpproxy/IgmpManager.java b/src/main/java/org/opencord/igmpproxy/IgmpManager.java
index d57c42e..1b95105 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpManager.java
+++ b/src/main/java/org/opencord/igmpproxy/IgmpManager.java
@@ -206,6 +206,7 @@
         McastConfig config = networkConfig.getConfig(coreAppId, MCAST_CONFIG_CLASS);
         if (config != null) {
             mvlan = config.egressVlan().toShort();
+            IgmpSender.getInstance().setMvlan(mvlan);
         }
         deviceService.addListener(deviceListener);
         scheduledExecutorService.scheduleAtFixedRate(new IgmpProxyTimerTask(), 0, 1000, TimeUnit.MILLISECONDS);
@@ -739,6 +740,7 @@
                         McastConfig config = networkConfig.getConfig(coreAppId, MCAST_CONFIG_CLASS);
                         if (config != null && mvlan != config.egressVlan().toShort()) {
                             mvlan = config.egressVlan().toShort();
+                            IgmpSender.getInstance().setMvlan(mvlan);
                             groupMemberMap.values().forEach(m -> leaveAction(m));
                         }
                     }