X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=bgp%2Frib-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbgp%2Frib%2Fimpl%2FAbstractPeer.java;fp=bgp%2Frib-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbgp%2Frib%2Fimpl%2FAbstractPeer.java;h=02b9bbfeaf83653f1e85ebd8465288ee380927bd;hb=22895faa7e282c28a06ef4f1b95d431697774958;hp=96ef6019618fc6b59989f499feb138f8b6214200;hpb=15dd40c3fd6dbfac67b9fca232d8c7a7a592f7d0;p=bgpcep.git diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeer.java index 96ef601961..02b9bbfeaf 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeer.java @@ -13,8 +13,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.MoreExecutors; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; @@ -84,7 +82,7 @@ abstract class AbstractPeer extends BGPPeerStateImpl implements BGPRouteEntryImp // hence we want to use the two chains concurrently. The problem is their lifecycle in response to errors, // which needs figuring out. @GuardedBy("this") - private DOMTransactionChain domChain; + private DOMTransactionChain domChain = null; // FIXME: This is an invariant once the peer is 'resolved' -- which happens instantaneously for ApplicationPeer. // There are also a number YangInstanceIdentifiers which are tied to it. We want to keep all of them in one // structure for isolation. This could be a separate DTO (JDK16 record) or isolated into an abstract behavior @@ -99,8 +97,6 @@ abstract class AbstractPeer extends BGPPeerStateImpl implements BGPRouteEntryImp @GuardedBy("this") private FluentFuture submitted; - @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR", - justification = "False positive on synchronized createDomChain()") AbstractPeer( final RIB rib, final String peerName, @@ -119,18 +115,6 @@ abstract class AbstractPeer extends BGPPeerStateImpl implements BGPRouteEntryImp this.clusterId = clusterId; this.localAs = localAs; this.rib = rib; - createDomChain(); - } - - AbstractPeer( - final RIB rib, - final String peerName, - final String groupId, - final PeerRole role, - final IpAddressNoZone neighborAddress, - final Set afiSafisGracefulAdvertized) { - this(rib, peerName, groupId, role, null, null, neighborAddress, - rib.getLocalTablesKeys(), afiSafisGracefulAdvertized, Collections.emptyMap()); } final synchronized FluentFuture removePeer(final @Nullable YangInstanceIdentifier peerPath) {