BUG-2475: Fix keepalives not being sent

As it turns out, we failed to update channel configuration when MD5 keys
were not specified.

Change-Id: I5c2a5983c0797d032bb058974aac82254b554041
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java
index 7d924de27cf7fbcbb9e9b1100cbc9fcd9c8d6bdf..9d2139bbae09338a6b69d8e3b169fcd16b1a8344 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java
@@ -127,9 +127,10 @@ public final class BGPDispatcherImpl extends AbstractDispatcher<BGPSessionImpl,
             }
             b.channelFactory(this.cf);
             b.option(MD5ChannelOption.TCP_MD5SIG, this.keys);
-            // Make sure we are doing round-robin processing
-            b.option(ChannelOption.MAX_MESSAGES_PER_READ, 1);
         }
+
+        // Make sure we are doing round-robin processing
+        b.option(ChannelOption.MAX_MESSAGES_PER_READ, 1);
     }
 
     @Override
@@ -140,9 +141,10 @@ public final class BGPDispatcherImpl extends AbstractDispatcher<BGPSessionImpl,
             }
             b.channelFactory(this.scf);
             b.option(MD5ChannelOption.TCP_MD5SIG, this.keys);
-            // Make sure we are doing round-robin processing
-            b.childOption(ChannelOption.MAX_MESSAGES_PER_READ, 1);
         }
+
+        // Make sure we are doing round-robin processing
+        b.childOption(ChannelOption.MAX_MESSAGES_PER_READ, 1);
     }
 
 }