commit 01f33b46ce46bf06ef94bfd3a2a5e06b7dd1b93d
author Deepa Vaddireddy <dvaddire@partner.ciena.com> Sun Jul 02 13:26:53 2017 +0530
committer Deepa vaddireddy <dvaddire@partner.ciena.com> Thu Jul 20 23:37:16 2017 -0700
tree e56e44aa56d18bd761b037445543ceaffdac389b
parent 81a38b90e0a2afab4bf4261352e539ae4096c100

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

Change-Id: I130cb0923433028800d36c2f09817a3b8a228fc7

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 4194b92..6a885d7 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpManager.java
+++ b/src/main/java/org/opencord/igmpproxy/IgmpManager.java
@@ -556,9 +556,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));