Bump upstreams to 2022.09

[bgpcep.git] / bgp / rib-impl / src / main / java / org / opendaylight / protocol / bgp / rib / impl / BgpPeerUtil.java

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerUtil.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerUtil.java
index bd9cc694a43fd890298981c12dbe53b7a1af5dc6..36e51d48fd28474e0b1ffae5528c5d13a8503018 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerUtil.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerUtil.java
@@ -33,17 +33,20 @@ public final class BgpPeerUtil {
      * @return UPDATE message with EOR marker
      */
     public static Update createEndOfRib(final TablesKey key) {
-        return key.getAfi() == Ipv4AddressFamily.class && key.getSafi() == UnicastSubsequentAddressFamily.class
-                ? new UpdateBuilder().build() : new UpdateBuilder()
-                        .setAttributes(new AttributesBuilder()
-                            .addAugmentation(new AttributesUnreachBuilder()
-                                .setMpUnreachNlri(new MpUnreachNlriBuilder()
-                                    .setAfi(key.getAfi())
-                                    .setSafi(key.getSafi())
-                                    .build())
-                                .build())
-                            .build())
-                        .build();
+        final var builder = new UpdateBuilder();
+        final var afi = key.getAfi();
+        final var safi = key.getSafi();
+        if (!Ipv4AddressFamily.VALUE.equals(afi) || !UnicastSubsequentAddressFamily.VALUE.equals(safi)) {
+            builder.setAttributes(new AttributesBuilder()
+                .addAugmentation(new AttributesUnreachBuilder()
+                    .setMpUnreachNlri(new MpUnreachNlriBuilder()
+                        .setAfi(key.getAfi())
+                        .setSafi(key.getSafi())
+                        .build())
+                    .build())
+                .build());
+        }
+        return builder.build();
     }
 
     /**