commit | 239492c218e221fa270736db68965df8acc57834 | [log] [tgz] |
---|---|---|
author | Charles Chan <rascov@gmail.com> | Mon Jan 22 13:27:28 2018 -0800 |
committer | Charles Chan <charles@opennetworking.org> | Mon Jan 22 21:42:58 2018 +0000 |
tree | ee063f360ba52535aee0cad52f449bf3771879dd | |
parent | 3a5731e32d549f0c78f273a94b7602c69f7cefaf [diff] |
Fix NPE in Dhcp6HandlerImpl Change-Id: I6556d4be3a01604e47ab7ccf35f2c311422decd7 (cherry picked from commit f1aed03c2ecf36100c151a5b5be81b9ecc72d1d1)
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 35b581f..2990e5a 100644 --- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java +++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
@@ -828,7 +828,7 @@ + "packet from client on port: {}. Aborting packet processing", clientInterfaces.iterator().next().connectPoint()); dhcpRelayCountersStore.incrementCounter(gCount, DhcpRelayCounters.NO_CLIENT_INTF_MAC); - return null; + return Lists.newArrayList(); } IPv6 clientIpv6 = (IPv6) clientPacket.getPayload();