Remove netconf-impl's getConfig_candidate.xml

[netconf.git] / netconf / netconf-ssh / src / test / java / org / opendaylight / netconf / netty / EchoServer.java

diff --git a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java b/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java
index a6f9e6cb66595bd0616c35774684571fe683a11b..fed42f255b57af182c8312530bbbddee247b4ebc 100644 (file)
--- a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java
+++ b/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java
@@ -21,7 +21,7 @@ import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import org.opendaylight.netconf.util.osgi.NetconfConfiguration;
+import org.opendaylight.netconf.util.NetconfConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,13 +31,14 @@ import org.slf4j.LoggerFactory;
 public class EchoServer implements Runnable {
     private static final Logger LOG = LoggerFactory.getLogger(EchoServer.class);
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public void run() {
         // Configure the server.
         EventLoopGroup bossGroup = new NioEventLoopGroup(1);
         EventLoopGroup workerGroup = new NioEventLoopGroup();
         try {
-            ServerBootstrap b = new ServerBootstrap();
-            b.group(bossGroup, workerGroup)
+            ServerBootstrap bootstrap = new ServerBootstrap();
+            bootstrap.group(bossGroup, workerGroup)
                     .channel(LocalServerChannel.class)
                     .option(ChannelOption.SO_BACKLOG, 100)
                     .handler(new LoggingHandler(LogLevel.INFO))
@@ -50,10 +51,10 @@ public class EchoServer implements Runnable {
 
             // Start the server.
             LocalAddress localAddress = NetconfConfiguration.NETCONF_LOCAL_ADDRESS;
-            ChannelFuture f = b.bind(localAddress).sync();
+            ChannelFuture future = bootstrap.bind(localAddress).sync();
 
             // Wait until the server socket is closed.
-            f.channel().closeFuture().sync();
+            future.channel().closeFuture().sync();
         } catch (Exception e) {
             throw new RuntimeException(e);
         } finally {