Added shutdown() for ExecutorService

BruceEckel · BruceEckel · commit 6545d1606b40 · 2016-12-04T12:15:21.000-08:00
diff --git a/concurrent/CaptureUncaughtException.java b/concurrent/CaptureUncaughtException.java
@@ -3,7 +3,6 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://OnJava8.com for more book information.
 import java.util.concurrent.*;
-import onjava.TimedAbort;
 
 class ExceptionThread2 implements Runnable {
   @Override
@@ -40,21 +39,17 @@ public Thread newThread(Runnable r) {
 
 public class CaptureUncaughtException {
   public static void main(String[] args) {
-    new TimedAbort(4);
     ExecutorService exec = Executors.newCachedThreadPool(
       new HandlerThreadFactory());
     exec.execute(new ExceptionThread2());
+    exec.shutdown();
   }
 }
 /* Output:
-HandlerThreadFactory@14991ad creating new Thread
-created Thread[Thread-1,5,main]
-eh = MyUncaughtExceptionHandler@d93b30
-run() by Thread-1
-eh = MyUncaughtExceptionHandler@d93b30
-HandlerThreadFactory@14991ad creating new Thread
-created Thread[Thread-2,5,main]
-eh = MyUncaughtExceptionHandler@1351c58
+HandlerThreadFactory@4e25154f creating new Thread
+created Thread[Thread-0,5,main]
+eh = MyUncaughtExceptionHandler@70dea4e
+run() by Thread-0
+eh = MyUncaughtExceptionHandler@70dea4e
 caught java.lang.RuntimeException
-TimedAbort 4
 */
diff --git a/concurrent/ExceptionThread.java b/concurrent/ExceptionThread.java
@@ -14,5 +14,6 @@ public void run() {
   public static void main(String[] args) {
     ExecutorService es = Executors.newCachedThreadPool();
     es.execute(new ExceptionThread());
+    es.shutdown();
   }
 }
diff --git a/concurrent/NaiveExceptionHandling.java b/concurrent/NaiveExceptionHandling.java
@@ -8,13 +8,15 @@
 
 public class NaiveExceptionHandling {
   public static void main(String[] args) {
+    ExecutorService es =
+      Executors.newCachedThreadPool();
     try {
-      ExecutorService exec =
-        Executors.newCachedThreadPool();
-      exec.execute(new ExceptionThread());
+      es.execute(new ExceptionThread());
     } catch(RuntimeException ue) {
       // This statement will NOT execute!
       System.out.println("Exception was handled!");
+    } finally {
+      es.shutdown();
     }
   }
 }
diff --git a/concurrent/SettingDefaultHandler.java b/concurrent/SettingDefaultHandler.java
@@ -3,18 +3,16 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://OnJava8.com for more book information.
 import java.util.concurrent.*;
-import onjava.TimedAbort;
 
 public class SettingDefaultHandler {
   public static void main(String[] args) {
-    new TimedAbort(4);
     Thread.setDefaultUncaughtExceptionHandler(
       new MyUncaughtExceptionHandler());
     ExecutorService es = Executors.newCachedThreadPool();
     es.execute(new ExceptionThread());
+    es.shutdown();
   }
 }
 /* Output:
 caught java.lang.RuntimeException
-TimedAbort 4
 */
diff --git a/concurrent/SwallowedException.java b/concurrent/SwallowedException.java
@@ -12,6 +12,6 @@ public static void main(String[] args)
     exec.submit(() -> {
       throw new RuntimeException();
     });
-    exec.shutdownNow();
+    exec.shutdown();
   }
 }
diff --git a/concurrent/ThreadSize.java b/concurrent/ThreadSize.java
@@ -29,6 +29,8 @@ public static void main(String[] args) {
       System.out.println(
         e.getClass().getSimpleName() + ": " + count);
       System.exit(0);
+    } finally {
+      exec.shutdown();
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,6 @@ public void run() {`
`14`	`14`	`public static void main(String[] args) {`
`15`	`15`	`ExecutorService es = Executors.newCachedThreadPool();`
`16`	`16`	`es.execute(new ExceptionThread());`
	`17`	`+ es.shutdown();`
`17`	`18`	`}`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,15 @@`
`8`	`8`
`9`	`9`	`public class NaiveExceptionHandling {`
`10`	`10`	`public static void main(String[] args) {`
	`11`	`+ ExecutorService es =`
	`12`	`+ Executors.newCachedThreadPool();`
`11`	`13`	`try {`
`12`		`- ExecutorService exec =`
`13`		`- Executors.newCachedThreadPool();`
`14`		`- exec.execute(new ExceptionThread());`
	`14`	`+ es.execute(new ExceptionThread());`
`15`	`15`	`} catch(RuntimeException ue) {`
`16`	`16`	`// This statement will NOT execute!`
`17`	`17`	`System.out.println("Exception was handled!");`
	`18`	`+ } finally {`
	`19`	`+ es.shutdown();`
`18`	`20`	`}`
`19`	`21`	`}`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ public static void main(String[] args)`
`12`	`12`	`exec.submit(() -> {`
`13`	`13`	`throw new RuntimeException();`
`14`	`14`	`});`
`15`		`- exec.shutdownNow();`
	`15`	`+ exec.shutdown();`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ public static void main(String[] args) {`
`29`	`29`	`System.out.println(`
`30`	`30`	`e.getClass().getSimpleName() + ": " + count);`
`31`	`31`	`System.exit(0);`
	`32`	`+ } finally {`
	`33`	`+ exec.shutdown();`
`32`	`34`	`}`
`33`	`35`	`}`
`34`	`36`	`}`