From: Ed Warnicke <eaw@cisco.com>
Date: Fri, 20 Dec 2013 15:25:18 +0000 (+0000)
Subject: Merge "Fix HashedWheelTimer exception for short living netconf clients."
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~162
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=ed8bad6f90ebed55cd7b846ea9582b2f3837f622;hp=51a5ee5ce9435af02a7f79503ab096890878a7f1

Merge "Fix HashedWheelTimer exception for short living netconf clients."
---

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);