2 files changed, 2 insertions, 48 deletions
diff --git a/src/main/java/org/traccar/GlobalTimer.java b/src/main/java/org/traccar/GlobalTimer.java
deleted file mode 100644
index a97321ba2..000000000
--- a/src/main/java/org/traccar/GlobalTimer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2012 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar;
-
-import io.netty.util.HashedWheelTimer;
-import io.netty.util.Timer;
-
-public final class GlobalTimer {
-
-    private static Timer instance = null;
-
-    private GlobalTimer() {
-    }
-
-    public static void release() {
-        if (instance != null) {
-            instance.stop();
-        }
-        instance = null;
-    }
-
-    public static Timer getTimer() {
-        if (instance == null) {
-            instance = new HashedWheelTimer();
-        }
-        return instance;
-    }
-
-}
diff --git a/src/main/java/org/traccar/ServerManager.java b/src/main/java/org/traccar/ServerManager.java
index e91be50a2..22af66b41 100644
--- a/src/main/java/org/traccar/ServerManager.java
+++ b/src/main/java/org/traccar/ServerManager.java
@@ -82,12 +82,8 @@ public class ServerManager implements LifecycleObject {
 
     @Override
     public void stop() throws Exception {
-        try {
-            for (TrackerConnector connector : connectorList) {
-                connector.stop();
-            }
-        } finally {
-            GlobalTimer.release();
+        for (TrackerConnector connector : connectorList) {
+            connector.stop();
         }
     }