commit | 613ac375d3cfccc21afd3868052c2eaf0849d416 | [log] [tgz] |
---|---|---|
author | Daniel Park <dan.mcpark84@gmail.com> | Thu Jun 28 14:30:11 2018 +0900 |
committer | Jian Li <pyguni@gmail.com> | Thu Jun 28 09:01:07 2018 +0000 |
tree | 5718ff6a699dadc06950bb87813fb339a2a7b326 | |
parent | 85573f4decd4496de01dfe504d6fbf81b5531bfe [diff] [blame] |
Fixes setFakeGatewayArpRule called with in case of openstack node event. Change-Id: I5b3177b8d41342e1adef4b700f02fc8555039fb1
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java index 76f164f..fe5f483 100644 --- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java +++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java
@@ -438,6 +438,10 @@ @Override public void deleteExternalPeerRouter(ExternalGateway externalGateway) { + if (externalGateway == null) { + return; + } + IpAddress targetIp = getExternalPeerRouterIp(externalGateway); if (targetIp == null) { return; @@ -555,6 +559,9 @@ } private IpAddress getExternalPeerRouterIp(ExternalGateway externalGateway) { + if (externalGateway == null) { + return null; + } Optional<Subnet> externalSubnet = subnets(externalGateway.getNetworkId()) .stream() .findFirst();