Fix for BGP sessions not timing out

Change-Id: I57975fefe6d54934cbbde95b6d22e03bea835289

@@ -93,7 +93,7 @@ class BgpFrameDecoder extends FrameDecoder {
                     bgpSession.prepareBgpNotification(errorCode, errorSubcode,
                     bgpSession.prepareBgpNotification(errorCode, errorSubcode,
                                                       null);
                                                       null);
                 ctx.getChannel().write(txMessage);
                 ctx.getChannel().write(txMessage);
-                bgpSession.closeChannel(ctx);
+                bgpSession.closeSession(ctx);
                 return null;
                 return null;
             }
             }
         }
         }
@@ -116,7 +116,7 @@ class BgpFrameDecoder extends FrameDecoder {
             ChannelBuffer txMessage =
             ChannelBuffer txMessage =
                 bgpSession.prepareBgpNotificationBadMessageLength(length);
                 bgpSession.prepareBgpNotificationBadMessageLength(length);
             ctx.getChannel().write(txMessage);
             ctx.getChannel().write(txMessage);
-            bgpSession.closeChannel(ctx);
+            bgpSession.closeSession(ctx);
             return null;
             return null;
         }
         }
 
 
@@ -169,7 +169,7 @@ class BgpFrameDecoder extends FrameDecoder {
                 bgpSession.prepareBgpNotification(errorCode, errorSubcode,
                 bgpSession.prepareBgpNotification(errorCode, errorSubcode,
                                                   data);
                                                   data);
             ctx.getChannel().write(txMessage);
             ctx.getChannel().write(txMessage);
-            bgpSession.closeChannel(ctx);
+            bgpSession.closeSession(ctx);
             return null;
             return null;
         }
         }
         return null;
         return null;

@@ -226,13 +226,22 @@ public class BgpSession extends SimpleChannelHandler {
     }
     }
 
 
     /**
     /**
-     * Closes the channel.
+     * Closes the session.
+     *
+     * @param ctx the Channel Handler Context
+     */
+    void closeSession(ChannelHandlerContext ctx) {
+        timer.stop();
+        closeChannel(ctx);
+    }
+
+    /**
+     * Closes the netty channel.
      *
      *
      * @param ctx the Channel Handler Context
      * @param ctx the Channel Handler Context
      */
      */
     void closeChannel(ChannelHandlerContext ctx) {
     void closeChannel(ChannelHandlerContext ctx) {
         isClosed = true;
         isClosed = true;
-        timer.stop();
         ctx.getChannel().close();
         ctx.getChannel().close();
     }
     }
 
 
@@ -320,7 +329,7 @@ public class BgpSession extends SimpleChannelHandler {
             ChannelBuffer txMessage = prepareBgpNotificationBadMessageLength(
             ChannelBuffer txMessage = prepareBgpNotificationBadMessageLength(
                 message.readableBytes() + BgpConstants.BGP_HEADER_LENGTH);
                 message.readableBytes() + BgpConstants.BGP_HEADER_LENGTH);
             ctx.getChannel().write(txMessage);
             ctx.getChannel().write(txMessage);
-            closeChannel(ctx);
+            closeSession(ctx);
             return;
             return;
         }
         }
 
 
@@ -345,7 +354,7 @@ public class BgpSession extends SimpleChannelHandler {
             ChannelBuffer txMessage =
             ChannelBuffer txMessage =
                 prepareBgpNotification(errorCode, errorSubcode, data);
                 prepareBgpNotification(errorCode, errorSubcode, data);
             ctx.getChannel().write(txMessage);
             ctx.getChannel().write(txMessage);
-            closeChannel(ctx);
+            closeSession(ctx);
             return;
             return;
         }
         }
 
 
@@ -370,7 +379,7 @@ public class BgpSession extends SimpleChannelHandler {
                 ChannelBuffer txMessage =
                 ChannelBuffer txMessage =
                     prepareBgpNotification(errorCode, errorSubcode, null);
                     prepareBgpNotification(errorCode, errorSubcode, null);
                 ctx.getChannel().write(txMessage);
                 ctx.getChannel().write(txMessage);
-                closeChannel(ctx);
+                closeSession(ctx);
                 return;
                 return;
             }
             }
         }
         }
@@ -393,7 +402,7 @@ public class BgpSession extends SimpleChannelHandler {
             ChannelBuffer txMessage =
             ChannelBuffer txMessage =
                 prepareBgpNotification(errorCode, errorSubcode, null);
                 prepareBgpNotification(errorCode, errorSubcode, null);
             ctx.getChannel().write(txMessage);
             ctx.getChannel().write(txMessage);
-            closeChannel(ctx);
+            closeSession(ctx);
             return;
             return;
         }
         }
 
 
@@ -416,7 +425,7 @@ public class BgpSession extends SimpleChannelHandler {
             ChannelBuffer txMessage =
             ChannelBuffer txMessage =
                 prepareBgpNotification(errorCode, errorSubcode, null);
                 prepareBgpNotification(errorCode, errorSubcode, null);
             ctx.getChannel().write(txMessage);
             ctx.getChannel().write(txMessage);
-            closeChannel(ctx);
+            closeSession(ctx);
             return;
             return;
         }
         }
         // TODO: Parse the optional parameters (if needed)
         // TODO: Parse the optional parameters (if needed)
@@ -485,7 +494,7 @@ public class BgpSession extends SimpleChannelHandler {
             ChannelBuffer txMessage = prepareBgpNotificationBadMessageLength(
             ChannelBuffer txMessage = prepareBgpNotificationBadMessageLength(
                 message.readableBytes() + BgpConstants.BGP_HEADER_LENGTH);
                 message.readableBytes() + BgpConstants.BGP_HEADER_LENGTH);
             ctx.getChannel().write(txMessage);
             ctx.getChannel().write(txMessage);
-            closeChannel(ctx);
+            closeSession(ctx);
             return;
             return;
         }
         }
 
 
@@ -1284,7 +1293,7 @@ public class BgpSession extends SimpleChannelHandler {
         ChannelBuffer txMessage =
         ChannelBuffer txMessage =
             prepareBgpNotification(errorCode, errorSubcode, null);
             prepareBgpNotification(errorCode, errorSubcode, null);
         ctx.getChannel().write(txMessage);
         ctx.getChannel().write(txMessage);
-        closeChannel(ctx);
+        closeSession(ctx);
     }
     }
 
 
     /**
     /**
@@ -1307,7 +1316,7 @@ public class BgpSession extends SimpleChannelHandler {
         ChannelBuffer txMessage =
         ChannelBuffer txMessage =
             prepareBgpNotification(errorCode, errorSubcode, null);
             prepareBgpNotification(errorCode, errorSubcode, null);
         ctx.getChannel().write(txMessage);
         ctx.getChannel().write(txMessage);
-        closeChannel(ctx);
+        closeSession(ctx);
     }
     }
 
 
     /**
     /**
@@ -1335,7 +1344,7 @@ public class BgpSession extends SimpleChannelHandler {
         ChannelBuffer txMessage =
         ChannelBuffer txMessage =
             prepareBgpNotification(errorCode, errorSubcode, data);
             prepareBgpNotification(errorCode, errorSubcode, data);
         ctx.getChannel().write(txMessage);
         ctx.getChannel().write(txMessage);
-        closeChannel(ctx);
+        closeSession(ctx);
     }
     }
 
 
     /**
     /**
@@ -1371,7 +1380,7 @@ public class BgpSession extends SimpleChannelHandler {
         ChannelBuffer txMessage =
         ChannelBuffer txMessage =
             prepareBgpNotification(errorCode, errorSubcode, data);
             prepareBgpNotification(errorCode, errorSubcode, data);
         ctx.getChannel().write(txMessage);
         ctx.getChannel().write(txMessage);
-        closeChannel(ctx);
+        closeSession(ctx);
     }
     }
 
 
     /**
     /**
@@ -1405,7 +1414,7 @@ public class BgpSession extends SimpleChannelHandler {
         ChannelBuffer txMessage =
         ChannelBuffer txMessage =
             prepareBgpNotification(errorCode, errorSubcode, data);
             prepareBgpNotification(errorCode, errorSubcode, data);
         ctx.getChannel().write(txMessage);
         ctx.getChannel().write(txMessage);
-        closeChannel(ctx);
+        closeSession(ctx);
     }
     }
 
 
     /**
     /**
@@ -1442,7 +1451,7 @@ public class BgpSession extends SimpleChannelHandler {
         ChannelBuffer txMessage =
         ChannelBuffer txMessage =
             prepareBgpNotification(errorCode, errorSubcode, data);
             prepareBgpNotification(errorCode, errorSubcode, data);
         ctx.getChannel().write(txMessage);
         ctx.getChannel().write(txMessage);
-        closeChannel(ctx);
+        closeSession(ctx);
     }
     }
 
 
     /**
     /**
@@ -1479,7 +1488,7 @@ public class BgpSession extends SimpleChannelHandler {
         ChannelBuffer txMessage =
         ChannelBuffer txMessage =
             prepareBgpNotification(errorCode, errorSubcode, data);
             prepareBgpNotification(errorCode, errorSubcode, data);
         ctx.getChannel().write(txMessage);
         ctx.getChannel().write(txMessage);
-        closeChannel(ctx);
+        closeSession(ctx);
     }
     }
 
 
     /**
     /**
@@ -1513,7 +1522,7 @@ public class BgpSession extends SimpleChannelHandler {
         ChannelBuffer txMessage =
         ChannelBuffer txMessage =
             prepareBgpNotification(errorCode, errorSubcode, data);
             prepareBgpNotification(errorCode, errorSubcode, data);
         ctx.getChannel().write(txMessage);
         ctx.getChannel().write(txMessage);
-        closeChannel(ctx);
+        closeSession(ctx);
     }
     }
 
 
     /**
     /**
@@ -1536,7 +1545,7 @@ public class BgpSession extends SimpleChannelHandler {
         ChannelBuffer txMessage =
         ChannelBuffer txMessage =
             prepareBgpNotification(errorCode, errorSubcode, null);
             prepareBgpNotification(errorCode, errorSubcode, null);
         ctx.getChannel().write(txMessage);
         ctx.getChannel().write(txMessage);
-        closeChannel(ctx);
+        closeSession(ctx);
     }
     }
 
 
     /**
     /**
@@ -1602,7 +1611,7 @@ public class BgpSession extends SimpleChannelHandler {
             ChannelBuffer txMessage = prepareBgpNotificationBadMessageLength(
             ChannelBuffer txMessage = prepareBgpNotificationBadMessageLength(
                 message.readableBytes() + BgpConstants.BGP_HEADER_LENGTH);
                 message.readableBytes() + BgpConstants.BGP_HEADER_LENGTH);
             ctx.getChannel().write(txMessage);
             ctx.getChannel().write(txMessage);
-            closeChannel(ctx);
+            closeSession(ctx);
             return;
             return;
         }
         }