From: Maros Marsalek <mmarsale@cisco.com>
Date: Fri, 20 Dec 2013 10:05:13 +0000 (+0100)
Subject: Fix HashedWheelTimer exception for short living netconf clients.
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~162^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=11be9b7b096c656c48b0bee178d88554ffba5fa9

Fix HashedWheelTimer exception for short living netconf clients.

An exception occurred in logs for short living netconf clients created by config persister.
These clients were closed before their initial check timer ran out.

Change-Id: Ic2c998d17788c9b92b72800415fd1ee068611f84
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---

diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSessionNegotiator.java b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSessionNegotiator.java
index e30ce5b47e..4fee930eff 100644
--- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSessionNegotiator.java
+++ b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/AbstractNetconfSessionNegotiator.java
@@ -124,8 +124,9 @@ public abstract class AbstractNetconfSessionNegotiator<P extends NetconfSessionP
                                 "Session was not established after " + timeout);
                         negotiationFailed(cause);
                         changeState(State.FAILED);
-                    } else
+                    } else if(channel.isOpen()) {
                         channel.pipeline().remove(NAME_OF_EXCEPTION_HANDLER);
+                    }
                 }
             }
         }, INITIAL_HOLDTIMER, TimeUnit.MINUTES);