Fix - Shutdown the ExecutorService in App so that the resources are collected and the process can finish

mkobit · mkobit · commit 07a77ba11dbd · 2015-10-14T07:01:15.000-05:00
I ran App.main(String[] args) in the 'double-checked-locking' module and the process does not terminate. This is because the executor service still has open threads. I'm not sure how the JUnit tests are run, but it seems they are handling the leftover resources themselves.

Also, minor modifications to Inventory for final fields are used since there is no state change around them, and added some more meaningful printing so the example is more clearly demonstrated
diff --git a/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/App.java b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/App.java
@@ -2,6 +2,7 @@
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 
@@ -26,13 +27,17 @@ public static void main(String[] args) {
 		final Inventory inventory = new Inventory(1000);
 		ExecutorService executorService = Executors.newFixedThreadPool(3);
 		for (int i = 0; i < 3; i++) {
-			executorService.execute(new Runnable() {
-				@Override
-				public void run() {
-					while (inventory.addItem(new Item()))
-						;
-				}
-			});
+			executorService.execute(() -> {
+                while (inventory.addItem(new Item()))
+                    ;
+            });
+		}
+
+		executorService.shutdown();
+		try {
+			executorService.awaitTermination(5, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {
+			System.out.println("Error waiting for ExecutorService shutdown");
 		}
 	}
 }
diff --git a/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java
@@ -12,13 +12,14 @@
  */
 public class Inventory {
 
-	private int inventorySize;
-	private List<Item> items;
-	private Lock lock = new ReentrantLock();
+	private final int inventorySize;
+	private final List<Item> items;
+	private final Lock lock;
 
 	public Inventory(int inventorySize) {
 		this.inventorySize = inventorySize;
-		this.items = new ArrayList<Item>(inventorySize);
+		this.items = new ArrayList<>(inventorySize);
+		this.lock = new ReentrantLock();
 	}
 
 	public boolean addItem(Item item) {
@@ -27,7 +28,9 @@ public boolean addItem(Item item) {
 			try {
 				if (items.size() < inventorySize) {
 					items.add(item);
-					System.out.println(Thread.currentThread());
+					System.out.println(Thread.currentThread()
+							+ ": items.size()=" + items.size()
+							+ ", inventorySize=" + inventorySize);
 					return true;
 				}
 			} finally {
