From: Maros Marsalek <mmarsale@cisco.com>
Date: Tue, 18 Feb 2014 11:58:47 +0000 (+0100)
Subject: Make use of new sendMessage method in AbstractNegotiator
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~400
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F5393%2F2;hp=df2aabb0c61b9be04623c2a660c5a1592ff051f7;p=controller.git

Make use of new sendMessage method in AbstractNegotiator

Change-Id: Ieeb104aa34b8140936a1daf8011ba3b0effc79d5
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 7f2d8c30f0..71f08339c8 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
@@ -123,7 +123,8 @@ extends AbstractSessionNegotiator<NetconfHelloMessage, S> {
             }
         }, connectionTimeoutMillis, TimeUnit.MILLISECONDS);
 
-        sendMessage(helloMessage);
+        // FIXME, make sessionPreferences return HelloMessage, move NetconfHelloMessage to API
+        sendMessage((NetconfHelloMessage)helloMessage);
         changeState(State.OPEN_WAIT);
     }
 
@@ -133,10 +134,6 @@ extends AbstractSessionNegotiator<NetconfHelloMessage, S> {
         }
     }
 
-    private void sendMessage(NetconfMessage message) {
-        this.channel.writeAndFlush(message);
-    }
-
     @Override
     protected void handleMessage(NetconfHelloMessage netconfMessage) {
         Preconditions.checkNotNull(netconfMessage != null, "netconfMessage");