From 06e3bd8b16da12baafc9a97ba5949b3f7ffb5e07 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 2 Jun 2018 22:12:44 +1200
Subject: Start Netty 4 migration

---
 src/org/traccar/ServerManager.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/org/traccar/ServerManager.java')

diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 45503b717..9cd5aed79 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -15,7 +15,7 @@
  */
 package org.traccar;
 
-import org.jboss.netty.channel.ChannelException;
+import io.netty.channel.ChannelException;
 import org.traccar.helper.Log;
 
 import java.io.File;
@@ -86,7 +86,7 @@ public class ServerManager {
                 server.start();
             } catch (ChannelException e) {
                 if (e.getCause() instanceof BindException) {
-                    Log.warning("One of the protocols is disabled due to port conflict");
+                    Log.warning("One of the protocols is disabled due to port conflict"); // TODO test this
                 }
             }
         }
@@ -96,7 +96,6 @@ public class ServerManager {
         for (TrackerServer server: serverList) {
             server.stop();
         }
-        GlobalChannelFactory.release();
         GlobalTimer.release();
     }
 
-- 
cgit v1.2.3