Bump upstream versions

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

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
index 03379af135a626d85f53cc9b594d8a63f6b7f0d8..12efb5e2b0d3f2e8dfbd832da87e5910e37ca4f3 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.protocol.bgp.rib.impl.protocol;
 
+import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.base.Preconditions;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
@@ -26,7 +26,7 @@ import org.opendaylight.protocol.bgp.rib.impl.StrictBGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.PeerRegistrySessionListener;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSession;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -142,20 +142,19 @@ public final class BGPProtocolSessionPromise<S extends BGPSession> extends Defau
         @Override
         public void operationComplete(final ChannelFuture channelFuture) throws Exception {
             synchronized (BGPProtocolSessionPromise.this) {
-                BGPProtocolSessionPromise.LOG.debug("Promise {} connection resolved", BGPProtocolSessionPromise.this);
-                Preconditions.checkState(BGPProtocolSessionPromise.this.pending.equals(channelFuture));
+                LOG.debug("Promise {} connection resolved", BGPProtocolSessionPromise.this);
+                checkState(BGPProtocolSessionPromise.this.pending.equals(channelFuture), "Unexpected promise %s",
+                    channelFuture);
                 if (BGPProtocolSessionPromise.this.isCancelled()) {
                     if (channelFuture.isSuccess()) {
-                        BGPProtocolSessionPromise.LOG.debug("Closing channel for cancelled promise {}",
-                                BGPProtocolSessionPromise.this);
+                        LOG.debug("Closing channel for cancelled promise {}", BGPProtocolSessionPromise.this);
                         channelFuture.channel().close();
                     }
                 } else if (channelFuture.isSuccess()) {
-                    BGPProtocolSessionPromise.LOG.debug("Promise {} connection successful",
-                            BGPProtocolSessionPromise.this);
+                    LOG.debug("Promise {} connection successful", BGPProtocolSessionPromise.this);
                 } else {
-                    BGPProtocolSessionPromise.LOG.warn("Attempt to connect to {} failed",
-                            BGPProtocolSessionPromise.this.address, channelFuture.cause());
+                    LOG.warn("Attempt to connect to {} failed", BGPProtocolSessionPromise.this.address,
+                        channelFuture.cause());
                     BGPProtocolSessionPromise.this.reconnect();
                 }
             }
@@ -163,36 +162,33 @@ public final class BGPProtocolSessionPromise<S extends BGPSession> extends Defau
     }
 
     private class PeerRegistrySessionListenerImpl implements PeerRegistrySessionListener {
-        private final IpAddress peerAddress;
+        private final IpAddressNoZone peerAddress;
 
-        PeerRegistrySessionListenerImpl(final IpAddress peerAddress) {
+        PeerRegistrySessionListenerImpl(final IpAddressNoZone peerAddress) {
             this.peerAddress = peerAddress;
         }
 
         @Override
-        public void onSessionCreated(final IpAddress ip) {
-            if (!ip.equals(this.peerAddress)) {
-                return;
-            }
-            BGPProtocolSessionPromise.LOG.debug("Callback for session creation with peer {} received", ip);
-            synchronized (BGPProtocolSessionPromise.this) {
-                BGPProtocolSessionPromise.this.peerSessionPresent = true;
+        public void onSessionCreated(final IpAddressNoZone ip) {
+            if (ip.equals(this.peerAddress)) {
+                LOG.debug("Callback for session creation with peer {} received", ip);
+                synchronized (BGPProtocolSessionPromise.this) {
+                    BGPProtocolSessionPromise.this.peerSessionPresent = true;
+                }
             }
         }
 
         @Override
-        public void onSessionRemoved(final IpAddress ip) {
-            if (!ip.equals(this.peerAddress)) {
-                return;
-            }
-            BGPProtocolSessionPromise.LOG.debug("Callback for session removal with peer {} received", ip);
-            synchronized (BGPProtocolSessionPromise.this) {
-                BGPProtocolSessionPromise.this.peerSessionPresent = false;
-                if (BGPProtocolSessionPromise.this.connectSkipped) {
-                    BGPProtocolSessionPromise.this.connect();
+        public void onSessionRemoved(final IpAddressNoZone ip) {
+            if (ip.equals(this.peerAddress)) {
+                LOG.debug("Callback for session removal with peer {} received", ip);
+                synchronized (BGPProtocolSessionPromise.this) {
+                    BGPProtocolSessionPromise.this.peerSessionPresent = false;
+                    if (BGPProtocolSessionPromise.this.connectSkipped) {
+                        BGPProtocolSessionPromise.this.connect();
+                    }
                 }
             }
         }
     }
-
 }