From 2af34886dfd5ec01b8411683c2415392d98d4e8c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 27 Jul 2020 19:02:56 +0200 Subject: [PATCH] Handle the case of empty optional capabilities Empty lists are being squashed to null, hence use nonnull to acquire an empty list back. JIRA: BGPCEP-915 Change-Id: I6483160e3637d3901e9a1f840cef03dd817b5523 Signed-off-by: Robert Varga --- .../protocol/bgp/rib/impl/StrictBGPPeerRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java index 598eec38e4..b60346f7f5 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java @@ -222,7 +222,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry { private static @Nullable As4BytesCapability getAs4BytesCapability(final List prefs) { for (final BgpParameters param : prefs) { - for (final OptionalCapabilities capa : param.getOptionalCapabilities()) { + for (final OptionalCapabilities capa : param.nonnullOptionalCapabilities()) { final CParameters cParam = capa.getCParameters(); final As4BytesCapability asCapa = cParam.getAs4BytesCapability(); if (asCapa != null) { -- 2.36.6