From: Robert Varga <rovarga@cisco.com>
Date: Tue, 21 Jan 2014 20:14:58 +0000 (+0100)
Subject: Make AbstractSessionNegotiator react to exceptions
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~11
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=17ec629f57ed977449962a5797f94ec6c3a3a8a8

Make AbstractSessionNegotiator react to exceptions

While the SessionNegotiator is present on the pipeline it should react
to exceptions happening on the channel by failing negotiation.

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

diff --git a/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java b/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java
index 5555fda7d5..9f9f811e88 100644
--- a/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java
+++ b/opendaylight/commons/protocol-framework/src/main/java/org/opendaylight/protocol/framework/AbstractSessionNegotiator.java
@@ -67,8 +67,14 @@ public abstract class AbstractSessionNegotiator<M, S extends AbstractProtocolSes
         try {
             handleMessage((M)msg);
         } catch (Exception e) {
-            logger.debug("Unexpected exception during negotiation", e);
+            logger.debug("Unexpected error while handling negotiation message {}", msg, e);
             negotiationFailed(e);
         }
     }
+
+    @Override
+    public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) {
+        logger.info("Unexpected error during negotiation", cause);
+        negotiationFailed(cause);
+    }
 }