commit fcb3ccf720a9af7c8f747d248f38e55fac5295a2
author David Bainbridge <dbainbri@ciena.com> Tue Aug 15 11:49:14 2017 -0700
committer Gerrit Code Review <gerrit@opencord.org> Tue Aug 15 11:49:14 2017 -0700
tree df79484b8f46cba674937f37c8c53bf1b17190fd
parent ca5ffb02c38ccca4002af20eeab86edd01f7621e
parent 01f33b46ce46bf06ef94bfd3a2a5e06b7dd1b93d

Merge "0001-CORD-1596 - NPE fix when the connect point is not configured for IGMP proxy app"

src/main/java/org/opencord/igmpproxy/IgmpManager.java

diff --git a/src/main/java/org/opencord/igmpproxy/IgmpManager.java b/src/main/java/org/opencord/igmpproxy/IgmpManager.java
index 36be625..d57c42e 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpManager.java
+++ b/src/main/java/org/opencord/igmpproxy/IgmpManager.java
@@ -571,9 +571,15 @@
     }
 
     private boolean isConnectPoint(DeviceId device, PortNumber port) {
-        return (connectPointMode && connectPoint.deviceId().equals(device)
-                && connectPoint.port().equals(port));
+        if (connectPoint != null) {
+            return (connectPointMode && connectPoint.deviceId().equals(device)
+                    && connectPoint.port().equals(port));
+        } else {
+            log.info("connectPoint not configured for device {}", device);
+            return false;
+        }
     }
+
     private boolean isUplink(DeviceId device, PortNumber port) {
         return ((!connectPointMode) && oltData.containsKey(device)
                 && oltData.get(device).uplink().equals(port));