improvement: Optimized NioReactor stop() (Reactor Pattern) (iluwatar#1930)

yuhangbin · web-flow · commit 69883196d29c · 2021-12-23T18:10:17.000+02:00
* Optimized NioReactor stop()

* Optimized ThreadPoolDispatcher stop()
diff --git a/reactor/src/main/java/com/iluwatar/reactor/framework/NioReactor.java b/reactor/src/main/java/com/iluwatar/reactor/framework/NioReactor.java
@@ -96,9 +96,11 @@ public void start() {
    * @throws IOException          if any I/O error occurs.
    */
   public void stop() throws InterruptedException, IOException {
-    reactorMain.shutdownNow();
+    reactorMain.shutdown();
     selector.wakeup();
-    reactorMain.awaitTermination(4, TimeUnit.SECONDS);
+    if (!reactorMain.awaitTermination(4, TimeUnit.SECONDS)) {
+      reactorMain.shutdownNow();
+    }
     selector.close();
     LOGGER.info("Reactor stopped");
   }
diff --git a/reactor/src/main/java/com/iluwatar/reactor/framework/ThreadPoolDispatcher.java b/reactor/src/main/java/com/iluwatar/reactor/framework/ThreadPoolDispatcher.java
@@ -64,6 +64,8 @@ public void onChannelReadEvent(AbstractNioChannel channel, Object readObject, Se
   @Override
   public void stop() throws InterruptedException {
     executorService.shutdown();
-    executorService.awaitTermination(4, TimeUnit.SECONDS);
+    if (executorService.awaitTermination(4, TimeUnit.SECONDS)) {
+      executorService.shutdownNow();
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@ public void onChannelReadEvent(AbstractNioChannel channel, Object readObject, Se`
`64`	`64`	`@Override`
`65`	`65`	`public void stop() throws InterruptedException {`
`66`	`66`	`executorService.shutdown();`
`67`		`- executorService.awaitTermination(4, TimeUnit.SECONDS);`
	`67`	`+ if (executorService.awaitTermination(4, TimeUnit.SECONDS)) {`
	`68`	`+ executorService.shutdownNow();`
	`69`	`+ }`
`68`	`70`	`}`
`69`	`71`	`}`