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 <robert.varga@pantheon.tech>
(cherry picked from commit 2af34886dfd5ec01b8411683c2415392d98d4e8c)

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 2d2fb8f8bc39951ac69ccd5820f78cd297cdad17..eb787e25e895430aabc493e61d997970f2c2ed75 100644 (file)
--- 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<BgpParameters> 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) {