commit | d4499a3079ab354b1c45496b4d2c1aecc8ba6667 | [log] [tgz] |
---|---|---|
author | Jose Miguel Guzman <jmguzman@whitestack.com> | Mon Oct 31 09:21:08 2016 -0300 |
committer | Jose Miguel Guzman <jmguzman@whitestack.com> | Mon Oct 31 09:29:18 2016 -0300 |
tree | 20e9eb567c9e360fbf875382aae665e915067fb5 | |
parent | 61d9ea9dd50355f6c2ca012420ba7264fb0e5e78 [diff] |
Prevents discoverLinksTasks from stopping if getLinks returns null (Exception) Change-Id: I5b89380435e5283fd9f0c05da6c5c46e5e440bfa
diff --git a/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java b/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java index a5fc042..7dc6f06 100644 --- a/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java +++ b/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java
@@ -202,6 +202,10 @@ } private void evaluateLinks(DeviceId deviceId, Set<LinkDescription> discoveredLinksDesc) { + if (discoveredLinksDesc == null) { + return; + } + //The provider will get only existing links related to LinkDiscovery Set<Link> storedLinks = linkService.getDeviceEgressLinks(deviceId) .stream()