commit aefbb00e0ce34732e42a88477855717fb9283ac2
author Yi Tseng <yi@opennetworking.org> Fri Sep 08 16:23:32 2017 -0700
committer Yi Tseng <yi@opennetworking.org> Sat Sep 09 00:18:12 2017 +0000
tree 3673c6913a26c4302ddffbacf3ce4d68e6193555
parent d8f145e447f6309110389a8be8d59c46f6645dcd

[CORD-1886] Fix DHCPv4 relay config handling bug

Change-Id: I08f53f27a9f9b652f8a6f8a8e5210e2b1910b903
(cherry picked from commit a5cde4521678d47a6b8db271d61d96f8eb6b4dc6)

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
index 0df73e4..f3835c0 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
@@ -196,10 +196,14 @@
         // TODO: currently we pick up first DHCP server config.
         // Will use other server configs in the future for HA.
         DhcpServerConfig serverConfig = configs.iterator().next();
-        checkState(serverConfig.getDhcpServerConnectPoint().isPresent(),
-                   "Connect point not exists");
-        checkState(serverConfig.getDhcpServerIp4().isPresent(),
-                   "IP of DHCP server not exists");
+        if (!serverConfig.getDhcpServerConnectPoint().isPresent()) {
+            log.warn("Connect point from server config not exists");
+            return;
+        }
+        if (!serverConfig.getDhcpServerIp4().isPresent()) {
+            log.warn("IP from DHCP server config not exists");
+            return;
+        }
         Ip4Address oldServerIp = this.dhcpServerIp;
         Ip4Address oldGatewayIp = this.dhcpGatewayIp;