Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 2517: Catch RuntimeExceptions thrown from the DCL in DataChangeListener"
[controller.git]
/
opendaylight
/
netconf
/
netconf-client
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
client
/
NetconfClientSession.java
diff --git
a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSession.java
b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSession.java
index bd91af5bcc95ba7f691d6880bbabe9483a865d2a..31a7661b2c17ccb8fdff3688f7111a26b4fe3f97 100644
(file)
--- a/
opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSession.java
+++ b/
opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSession.java
@@
-9,13
+9,11
@@
package org.opendaylight.controller.netconf.client;
import io.netty.channel.Channel;
package org.opendaylight.controller.netconf.client;
import io.netty.channel.Channel;
-
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.MessageToByteEncoder;
import java.util.Collection;
import java.util.Collection;
-
+import org.opendaylight.controller.netconf.api.NetconfMessage;
import org.opendaylight.controller.netconf.nettyutil.AbstractNetconfSession;
import org.opendaylight.controller.netconf.nettyutil.AbstractNetconfSession;
-import org.opendaylight.controller.netconf.nettyutil.handler.NetconfEXICodec;
-import org.opendaylight.controller.netconf.nettyutil.handler.NetconfEXIToMessageDecoder;
-import org.opendaylight.controller.netconf.nettyutil.handler.NetconfMessageToEXIEncoder;
import org.opendaylight.controller.netconf.nettyutil.handler.NetconfMessageToXMLEncoder;
import org.opendaylight.controller.netconf.nettyutil.handler.NetconfXMLToMessageDecoder;
import org.slf4j.Logger;
import org.opendaylight.controller.netconf.nettyutil.handler.NetconfMessageToXMLEncoder;
import org.opendaylight.controller.netconf.nettyutil.handler.NetconfXMLToMessageDecoder;
import org.slf4j.Logger;
@@
-23,7
+21,7
@@
import org.slf4j.LoggerFactory;
public class NetconfClientSession extends AbstractNetconfSession<NetconfClientSession, NetconfClientSessionListener> {
public class NetconfClientSession extends AbstractNetconfSession<NetconfClientSession, NetconfClientSessionListener> {
- private static final Logger
logger
= LoggerFactory.getLogger(NetconfClientSession.class);
+ private static final Logger
LOG
= LoggerFactory.getLogger(NetconfClientSession.class);
private final Collection<String> capabilities;
/**
private final Collection<String> capabilities;
/**
@@
-38,7
+36,7
@@
public class NetconfClientSession extends AbstractNetconfSession<NetconfClientSe
final Collection<String> capabilities) {
super(sessionListener, channel, sessionId);
this.capabilities = capabilities;
final Collection<String> capabilities) {
super(sessionListener, channel, sessionId);
this.capabilities = capabilities;
-
logger.debug("Client Session {} created", toString()
);
+
LOG.debug("Client Session {} created", this
);
}
public Collection<String> getServerCapabilities() {
}
public Collection<String> getServerCapabilities() {
@@
-51,10
+49,10
@@
public class NetconfClientSession extends AbstractNetconfSession<NetconfClientSe
}
@Override
}
@Override
- protected void addExiHandlers(final
NetconfEXICodec exiCodec
) {
+ protected void addExiHandlers(final
ByteToMessageDecoder decoder, final MessageToByteEncoder<NetconfMessage> encoder
) {
// TODO used only in negotiator, client supports only auto start-exi
// TODO used only in negotiator, client supports only auto start-exi
- replaceMessageDecoder(
new NetconfEXIToMessageDecoder(exiCodec)
);
- replaceMessageEncoder(
new NetconfMessageToEXIEncoder(exiCodec)
);
+ replaceMessageDecoder(
decoder
);
+ replaceMessageEncoder(
encoder
);
}
@Override
}
@Override