Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Make use of new sendMessage method in AbstractNegotiator
[controller.git]
/
opendaylight
/
netconf
/
netconf-util
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
util
/
AbstractNetconfSessionNegotiator.java
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 7f2d8c30f045fb6830458aa7fd461cc7885e8349..71f08339c803774d3d3b50a701b2d55454e9081e 100644
(file)
--- 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);
}
}, connectionTimeoutMillis, TimeUnit.MILLISECONDS);
- sendMessage(helloMessage);
+ // FIXME, make sessionPreferences return HelloMessage, move NetconfHelloMessage to API
+ sendMessage((NetconfHelloMessage)helloMessage);
changeState(State.OPEN_WAIT);
}
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");
@Override
protected void handleMessage(NetconfHelloMessage netconfMessage) {
Preconditions.checkNotNull(netconfMessage != null, "netconfMessage");