홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Shashikanth VH
Committed by Gerrit Code Review
a33f9a0c 1 parent 5fc14292

BGP system test issue fix 

Change-Id: I66958eeef622137ab5a3e75e172a6a5a5d0f1514
Inline Side-by-side
Showing 1 changed file with 8 additions and 17 deletions
......@@ -472,21 +472,12 @@ class BgpChannelHandler extends IdleStateAwareChannelHandler {
log.info("[exceptionCaught]: " + e.toString());
if (e.getCause() instanceof ReadTimeoutException) {
if ((ChannelState.OPENWAIT == state) || (ChannelState.OPENSENT == state)) {
// When ReadTimeout timer is expired in OPENWAIT/OPENSENT state, it is considered
sendNotification(BgpErrorType.HOLD_TIMER_EXPIRED, (byte) 0, null);
channel.close();
state = ChannelState.IDLE;
return;
} else if (ChannelState.OPENCONFIRM == state) {
// When ReadTimeout timer is expired in OPENCONFIRM state.
sendNotification(BgpErrorType.HOLD_TIMER_EXPIRED, (byte) 0, null);
channel.close();
state = ChannelState.IDLE;
return;
}
// device timeout
log.error("Disconnecting device {} due to read timeout", getPeerInfoString());
sendNotification(BgpErrorType.HOLD_TIMER_EXPIRED, (byte) 0, null);
state = ChannelState.IDLE;
ctx.getChannel().close();
return;
} else if (e.getCause() instanceof ClosedChannelException) {
log.debug("Channel for bgp {} already closed", getPeerInfoString());
} else if (e.getCause() instanceof IOException) {
......@@ -495,7 +486,7 @@ class BgpChannelHandler extends IdleStateAwareChannelHandler {
// still print stack trace if debug is enabled
log.debug("StackTrace for previous Exception: ", e.getCause());
}
channel.close();
ctx.getChannel().close();
} else if (e.getCause() instanceof BgpParseException) {
byte[] data = new byte[] {};
BgpParseException errMsg = (BgpParseException) e.getCause();
......@@ -512,7 +503,7 @@ class BgpChannelHandler extends IdleStateAwareChannelHandler {
log.warn("Could not process message: queue full");
} else {
log.error("Error while processing message from peer " + getPeerInfoString() + "state " + this.state);
channel.close();
ctx.getChannel().close();
}
}
......