X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-client%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fclient%2FNetconfClientSessionNegotiator.java;h=f8f73fc8e5296b9534e0759bc43f24bbf493521e;hp=3b280795fa94b87db8f4490273b8e2a4522e77ce;hb=9c9f6e506395f806978a955a8cf51ba736b978ad;hpb=40b7bf5aaa289756525a775bf63b3783a914ed38 diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java index 3b280795fa..f8f73fc8e5 100644 --- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java +++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java @@ -8,10 +8,15 @@ package org.opendaylight.controller.netconf.client; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpression; - +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.util.Timer; +import io.netty.util.concurrent.Promise; import org.opendaylight.controller.netconf.api.NetconfClientSessionPreferences; +import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.api.NetconfMessage; import org.opendaylight.controller.netconf.util.AbstractChannelInitializer; import org.opendaylight.controller.netconf.util.AbstractNetconfSessionNegotiator; @@ -26,13 +31,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelFutureListener; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.util.Timer; -import io.netty.util.concurrent.Promise; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; public class NetconfClientSessionNegotiator extends AbstractNetconfSessionNegotiator @@ -54,7 +54,7 @@ public class NetconfClientSessionNegotiator extends } @Override - protected void handleMessage(NetconfHelloMessage netconfMessage) { + protected void handleMessage(NetconfHelloMessage netconfMessage) throws NetconfDocumentedException { NetconfClientSession session = super.getSessionForHelloMessage(netconfMessage); if (shouldUseExi(netconfMessage.getDocument())){ @@ -109,7 +109,7 @@ public class NetconfClientSessionNegotiator extends } @Override - protected NetconfClientSession getSession(NetconfClientSessionListener sessionListener, Channel channel, NetconfHelloMessage message) { + protected NetconfClientSession getSession(NetconfClientSessionListener sessionListener, Channel channel, NetconfHelloMessage message) throws NetconfDocumentedException { return new NetconfClientSession(sessionListener, channel, extractSessionId(message.getDocument()), NetconfMessageUtil.extractCapabilitiesFromHello(message.getDocument())); }