From ca7192889dd0d00b6dba4964530110ecac6d1d26 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Mon, 3 Aug 2020 18:50:45 +0000 Subject: [PATCH] Fixes test cases for master-worker-pattern --- .../masterworker/system/systemmaster/Master.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java index 6f889edaa..a6d8966ea 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java @@ -75,7 +75,7 @@ public abstract class Master { } private void divideWork(Input input) { - List> dividedInput = input.divideData(numOfWorkers); + var dividedInput = input.divideData(numOfWorkers); if (dividedInput != null) { this.expectedNumResults = dividedInput.size(); for (var i = 0; i < this.expectedNumResults; i++) { @@ -83,6 +83,13 @@ public abstract class Master { this.workers.get(i).setReceivedData(this, dividedInput.get(i)); this.workers.get(i).start(); } + for (var i = 0; i < this.expectedNumResults; i++) { + try { + this.workers.get(i).join(); + } catch (InterruptedException e) { + System.err.println("Error while executing thread"); + } + } } }