Sonar suggestions - fixes to potential null pointer dereferences
Change-Id: I4e350a9d72a9322971d5d4f831f1bdf167986b87
diff --git a/apps/linkprops/src/main/java/org/onosproject/linkprops/LinkPropsTopovMessageHandler.java b/apps/linkprops/src/main/java/org/onosproject/linkprops/LinkPropsTopovMessageHandler.java
index 908c65c..a633ec0 100644
--- a/apps/linkprops/src/main/java/org/onosproject/linkprops/LinkPropsTopovMessageHandler.java
+++ b/apps/linkprops/src/main/java/org/onosproject/linkprops/LinkPropsTopovMessageHandler.java
@@ -248,27 +248,26 @@
*/
private Highlights getBandwidth(Set<Link> links, DeviceId devId) {
LpLinkMap linkMap = new LpLinkMap();
+ Highlights highlights = new Highlights();
if (links != null) {
log.debug("Processing {} links", links.size());
links.forEach(linkMap::add);
+
+ PortNumber portnum = PortNumber.portNumber((int) links.iterator().next().src().port().toLong());
+
+ for (LpLink dlink : linkMap.biLinks()) {
+ DiscreteResourceId parent = Resources.discrete(devId, portnum).id();
+ ContinuousResource continuousResource =
+ (ContinuousResource) resourceQueryService.getAvailableResources(parent,
+ Bandwidth.class).iterator().next();
+ double availBandwidth = continuousResource.value();
+
+ dlink.makeImportant().setLabel(Double.toString(availBandwidth) + " bytes/s");
+ highlights.add(dlink.highlight(null));
+ }
} else {
log.debug("No egress links found for device {}", devId);
}
-
- Highlights highlights = new Highlights();
-
- PortNumber portnum = PortNumber.portNumber((int) links.iterator().next().src().port().toLong());
-
- for (LpLink dlink : linkMap.biLinks()) {
- DiscreteResourceId parent = Resources.discrete(devId, portnum).id();
- ContinuousResource continuousResource =
- (ContinuousResource) resourceQueryService.getAvailableResources(parent,
- Bandwidth.class).iterator().next();
- double availBandwidth = continuousResource.value();
-
- dlink.makeImportant().setLabel(Double.toString(availBandwidth) + " bytes/s");
- highlights.add(dlink.highlight(null));
- }
return highlights;
}