| commit | 74e5913ec3a7ee58b207ba2501cc5a53e15bf644 | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@opennetworking.org> | Wed Jan 17 15:24:52 2018 -0800 |
| committer | Thomas Vachuska <tom@opennetworking.org> | Thu Jan 18 19:01:54 2018 +0000 |
| tree | 3b5cb1fa86d9180ef7e08d4fc2caf27cec45ad39 | |
| parent | 325c7575fa161fb83a2c8e1e512bdf6795063fc4 [diff] |
Sonar suggestions - fixes to potential null pointer dereferences Change-Id: I4e350a9d72a9322971d5d4f831f1bdf167986b87
diff --git a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java index eadb4cf..0633d12 100644 --- a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java +++ b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
@@ -418,6 +418,7 @@ // IPv6: Use Neighbor Discovery //TODO need to implement ndp probe log.info("Triggering probe on device {} ", host); + return; } TrafficTreatment treatment = DefaultTrafficTreatment.builder().setOutput(host.location().port()).build();
diff --git a/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java b/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java index a2d21bc..664aaa4 100644 --- a/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java +++ b/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java
@@ -1609,7 +1609,7 @@ DefaultTunnelDescription td; SparseAnnotations annotations = null; State tunnelState = PcepLspStatus.getTunnelStatusFromLspStatus(PcepLspStatus.values()[lspObj.getOFlag()]); - if (tunnel == null) { + if (tunnel == null && pathNameTlv != null) { if (lspObj.getRFlag()) { /* * If PCC sends remove message and for any reason PCE does not have that entry, simply discard the