Charles Chan
Committed by Gerrit Code Review

Fix NPE when ControlPlaneConnectPoint config is added after interface config

Change-Id: I31ee1d2e646d4b4c88ac5bb3b661228c893292b9
...@@ -597,9 +597,12 @@ public class ControlPlaneRedirectManager { ...@@ -597,9 +597,12 @@ public class ControlPlaneRedirectManager {
597 } 597 }
598 598
599 private class InternalInterfaceListener implements InterfaceListener { 599 private class InternalInterfaceListener implements InterfaceListener {
600 -
601 @Override 600 @Override
602 public void event(InterfaceEvent event) { 601 public void event(InterfaceEvent event) {
602 + if (controlPlaneConnectPoint == null) {
603 + log.info("Control plane connect point is not configured. Abort InterfaceEvent.");
604 + return;
605 + }
603 Interface intf = event.subject(); 606 Interface intf = event.subject();
604 Interface prevIntf = event.prevSubject(); 607 Interface prevIntf = event.prevSubject();
605 switch (event.type()) { 608 switch (event.type()) {
......