Telnet ConnectionManager should clean closed connections, fixes #709 (#…

…712)
jline · Oct 14, 2021 · bef9396 · bef9396
1 parent 5eaf519
commit bef9396
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionManager.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionManager.java
@@ -240,8 +240,6 @@ public void run() {
         //housekeep connections
         try {
             do {
-                //clean up and close all broken connections
-                //cleanupBroken();
                 //clean up closed connections
                 cleanupClosed();
                 //check all active connections
@@ -256,19 +254,6 @@ public void run() {
         LOG.log(Level.FINE, "run():: Ran out " + this.toString());
     }//run
 
-    /*
-    private void cleanupBroken() {
-      //cleanup loop
-      while (!m_BrokenConnections.isEmpty()) {
-        Connection nextOne = (Connection) m_BrokenConnections.pop();
-        log.info("cleanupBroken():: Closing broken connection " + nextOne.toString());
-        //fire logoff event for shell site cleanup , beware could hog the daemon thread
-        nextOne.processConnectionEvent(new ConnectionEvent(nextOne, ConnectionEvent.CONNECTION_BROKEN));
-        //close the connection, will be automatically registered as closed
-        nextOne.close();
-      }
-    }//cleanupBroken
-    */
     private void cleanupClosed() {
         if (stopping) {
             return;

diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/Telnet.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/Telnet.java
@@ -41,6 +41,7 @@ public interface ShellProvider {
     private final Terminal terminal;
     private final ShellProvider provider;
     private PortListener portListener;
+    private ConnectionManager connectionManager;
     private int port;
     private String ip;
 
@@ -94,7 +95,7 @@ private void status() {
     }
 
     private void start() throws IOException {
-        ConnectionManager connectionManager = new ConnectionManager(1000, 5 * 60 * 1000, 5 * 60 * 1000, 60 * 1000, null, null, false) {
+        connectionManager = new ConnectionManager(1000, 5 * 60 * 1000, 5 * 60 * 1000, 60 * 1000, null, null, false) {
             @Override
             protected Connection createConnection(ThreadGroup threadGroup, ConnectionData newCD) {
                 return new Connection(threadGroup, newCD) {
@@ -162,6 +163,7 @@ protected void doClose() throws Exception {
                 };
             }
         };
+        connectionManager.start();
         portListener = new PortListener("gogo", port, 10);
         portListener.setConnectionManager(connectionManager);
         portListener.start();
@@ -170,6 +172,8 @@ protected void doClose() throws Exception {
     private void stop() throws IOException {
         portListener.stop();
         portListener = null;
+        connectionManager.stop();
+        connectionManager = null;
     }
 
 }