[CORD-2320] DHCPv4 thows an exception when no indirect DHCPv4 server is configured
Change-Id: I516a75f1108ca1245267a45b805153e5eba003d8
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
index b4571e6..dcfc901 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
@@ -804,7 +804,16 @@
UDP clientUdp = (UDP) clientIpv6.getPayload();
DHCP6 clientDhcp6 = (DHCP6) clientUdp.getPayload();
boolean directConnFlag = directlyConnected(clientDhcp6);
- Interface serverInterface = directConnFlag ? getServerInterface() : getIndirectServerInterface();
+ Interface serverInterface;
+ if (directConnFlag) {
+ serverInterface = getServerInterface();
+ } else {
+ serverInterface = getIndirectServerInterface();
+ if (serverInterface == null) {
+ // Indirect server interface not found, use default server interface
+ serverInterface = getServerInterface();
+ }
+ }
if (serverInterface == null) {
log.warn("Can't get {} server interface, ignore", directConnFlag ? "direct" : "indirect");
return null;