commit 17d0f093cfd959062278f49fe31fdcc498816cab
author David K. Bainbridge <dbainbri@ciena.com> Thu Jan 23 10:15:06 2020 -0800
committer Jonathan Hart <jonomhart@gmail.com> Mon Feb 10 16:08:33 2020 -0800
tree 4ad7b0de77c3d6af301571b44f0f15636d562055
parent a64b3bcfbe91049375edf224d70804bc11589a64

pass a nullable optional value instead of null as it is dereferenced in the called function without a null check

Change-Id: I723cfd469de3e3d5392445371b7736d0d59c31bf

app/src/main/java/org/opencord/dhcpl2relay/impl/DhcpL2Relay.java

diff --git a/app/src/main/java/org/opencord/dhcpl2relay/impl/DhcpL2Relay.java b/app/src/main/java/org/opencord/dhcpl2relay/impl/DhcpL2Relay.java
index ba4bf1a..4bc4ca8 100755
--- a/app/src/main/java/org/opencord/dhcpl2relay/impl/DhcpL2Relay.java
+++ b/app/src/main/java/org/opencord/dhcpl2relay/impl/DhcpL2Relay.java
@@ -1149,7 +1149,7 @@
                         if (useOltUplink && isUplinkPortOfOlt(event.subject().id(), event.port())) {
                             requestDhcpPacketsFromConnectPoint(
                                 new ConnectPoint(event.subject().id(), event.port().number()),
-                                null);
+                                        Optional.ofNullable(null));
                         }
                         break;
                     default: