Terminate executor at shutdown time

jpos · Sep 17, 2023 · 64c0704 · 64c0704
1 parent a646ed5
commit 64c0704
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/jpos/src/main/java/org/jpos/iso/ISOServer.java b/jpos/src/main/java/org/jpos/iso/ISOServer.java
@@ -34,6 +34,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.LockSupport;
 
@@ -236,7 +237,8 @@ private void shutdownServer () {
                 serverSocket.close ();
                 fireEvent(new ISOServerShutdownEvent(this));
             }
-        } catch (IOException e) {
+            executor.awaitTermination(LONG_RELAX, TimeUnit.SECONDS);
+        } catch (IOException | InterruptedException e) {
             fireEvent(new ISOServerShutdownEvent(this));
             Logger.log (new LogEvent (this, "shutdown", e));
         }
@@ -601,6 +603,7 @@ public void resetCounters () {
         connectionCount.set(0);
         lastTxn = 0l;
     }
+
     /**
      * @return number of connections accepted by this server
      */

diff --git a/jpos/src/test/java/org/jpos/iso/SslChannelIntegrationTest.java b/jpos/src/test/java/org/jpos/iso/SslChannelIntegrationTest.java
@@ -26,6 +26,7 @@
 
 import java.io.EOFException;
 import java.io.IOException;
+import java.net.SocketTimeoutException;
 import java.util.Properties;
 
 import org.hamcrest.Description;
@@ -83,7 +84,7 @@ public void serverSideDisconnect() throws Exception {
 
         isoServer.shutdown();
 
-        assertThrows(EOFException.class, () -> {
+        assertThrows(SocketTimeoutException.class, () -> {
             clientChannel.receive();
         }, "clientChannel should be closed");
     }