From 115500137a782a71191cbf7b2d2fa83fd593e235 Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Thu, 5 Apr 2018 08:54:42 +0200 Subject: [PATCH] Fix missing return under AbstractBestPathSelector Change-Id: I0156a2be5a7772ecdbd55de5f5308092656b38eb Signed-off-by: Claudio D. Gasparini --- .../protocol/bgp/mode/impl/add/AddPathSelector.java | 3 ++- .../protocol/bgp/mode/impl/base/BasePathSelector.java | 3 ++- .../protocol/bgp/mode/spi/AbstractBestPathSelector.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathSelector.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathSelector.java index a4ee38ce1d..fa4fd2abf6 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathSelector.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathSelector.java @@ -13,6 +13,7 @@ import com.google.common.primitives.UnsignedInteger; import org.opendaylight.protocol.bgp.mode.api.BestPathState; import org.opendaylight.protocol.bgp.mode.impl.BestPathStateImpl; import org.opendaylight.protocol.bgp.mode.spi.AbstractBestPathSelector; +import org.opendaylight.protocol.bgp.rib.spi.RouterIds; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +42,7 @@ public final class AddPathSelector extends AbstractBestPathSelector { */ final BestPathState state = new BestPathStateImpl(attrs); if (this.bestOriginatorId == null || !isExistingPathBetter(state)) { - LOG.trace("Selecting path from router {}", key); + LOG.trace("Selecting path from router {}", RouterIds.createPeerId(key.getRouteId()).getValue()); this.bestOriginatorId = originatorId; this.bestState = state; this.bestRouteKey = key; diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelector.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelector.java index 9e209a0c66..6dbff1e1f3 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelector.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelector.java @@ -13,6 +13,7 @@ import com.google.common.primitives.UnsignedInteger; import org.opendaylight.protocol.bgp.mode.api.BestPathState; import org.opendaylight.protocol.bgp.mode.impl.BestPathStateImpl; import org.opendaylight.protocol.bgp.mode.spi.AbstractBestPathSelector; +import org.opendaylight.protocol.bgp.rib.spi.RouterIds; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev171207.path.attributes.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +39,7 @@ final class BasePathSelector extends AbstractBestPathSelector { */ final BestPathState state = new BestPathStateImpl(attrs); if (this.bestOriginatorId == null || !isExistingPathBetter(state)) { - LOG.trace("Selecting path from router {}", routerId); + LOG.trace("Selecting path from router {}", RouterIds.createPeerId(routerId).getValue()); this.bestOriginatorId = originatorId; this.bestRouterId = routerId; this.bestState = state; diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java index b5ca13826e..04ed6e682f 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java @@ -34,7 +34,7 @@ public class AbstractBestPathSelector { */ protected UnsignedInteger replaceOriginator(final UnsignedInteger routerId, final OriginatorId originatorId) { if (originatorId != null) { - RouterIds.routerIdForAddress(originatorId.getOriginator().getValue()); + return RouterIds.routerIdForAddress(originatorId.getOriginator().getValue()); } return routerId; -- 2.36.6