BUG-6038: Fix race condition when Open message...

[bgpcep.git] / bgp / rib-impl / src / test / java / org / opendaylight / protocol / bgp / rib / impl / SimpleSessionListener.java

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java
index c7e3d3aaca2c454a82bb39d4622b212244dd4020..d860d72a3b2e5f4168a65dc0ea4a4f2f515e76cf 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java
@@ -20,42 +20,38 @@ import org.slf4j.LoggerFactory;
 /**
  * Listener for the client.
  */
-public class SimpleSessionListener implements BGPSessionListener {
-
-    private final List<Notification> listMsg = Lists.newArrayList();
-
-    public boolean up = false;
+public final class SimpleSessionListener implements BGPSessionListener {
 
     private static final Logger LOG = LoggerFactory.getLogger(SimpleSessionListener.class);
-
-    public boolean down = false;
-
+    private final List<Notification> listMsg = Lists.newArrayList();
     private BGPSession session;
 
-    public SimpleSessionListener() {
+    SimpleSessionListener() {
     }
 
-    public List<Notification> getListMsg() {
+    List<Notification> getListMsg() {
         return this.listMsg;
     }
 
     @Override
-    public void onMessage(final BGPSession session, final Notification message) {
-        this.listMsg.add(message);
-        LOG.debug("Message received: {}", message);
+    public boolean isSessionActive() {
+        return ((BGPSessionImpl) this.session).isWritable();
+    }
+
+    @Override
+    public void markUptodate(final TablesKey tablesKey) {
+        LOG.debug("Table marked as up-to-date {}", tablesKey);
     }
 
     @Override
     public void onSessionUp(final BGPSession session) {
         LOG.debug("Session Up");
         this.session = session;
-        this.up = true;
     }
 
     @Override
     public void onSessionDown(final BGPSession session, final Exception e) {
         LOG.debug("Session Down", e);
-        this.down = true;
     }
 
     @Override
@@ -63,6 +59,12 @@ public class SimpleSessionListener implements BGPSessionListener {
         LOG.debug("Session terminated. Cause : {}", cause.toString());
     }
 
+    @Override
+    public void onMessage(final BGPSession session, final Notification message) {
+        this.listMsg.add(message);
+        LOG.debug("Message received: {}", message);
+    }
+
     @Override
     public void releaseConnection() {
         LOG.debug("Releasing connection");
@@ -72,17 +74,10 @@ public class SimpleSessionListener implements BGPSessionListener {
             } catch (final Exception e) {
                 LOG.warn("Error closing session", e);
             }
-            this.session = null;
         }
     }
 
-    @Override
-    public boolean isSessionActive() {
-        return true;
-    }
-
-    @Override
-    public void markUptodate(final TablesKey tablesKey) {
-        LOG.debug("Table marked as up-to-date {}", tablesKey);
+    BGPSessionImpl.State getState() {
+        return ((BGPSessionImpl) this.session).getState();
     }
 }