Eliminating Thread interference

ArnasSmicius · Jan 6, 2018 · ed955f8 · ed955f8
1 parent 1a74dc3
commit ed955f8
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 36 deletions.
diff --git a/ProducerConsumer/.idea/workspace.xml b/ProducerConsumer/.idea/workspace.xml
diff --git a/ProducerConsumer/src/com/timbuchalka/Main.java b/ProducerConsumer/src/com/timbuchalka/Main.java
@@ -37,16 +37,19 @@ public void run() {
         for (String num: nums) {
             try {
                 System.out.println(color + "Adding..." + num);
-                buffer.add(num);
-
+                synchronized (buffer) {
+                    buffer.add(num);
+                }
                 Thread.sleep(random.nextInt(1000));
             } catch (InterruptedException e) {
                 System.out.println("Producer was interrupted");
             }
         }
 
         System.out.println(color + "Adding EOF and exiting...");
-        buffer.add("EOF");
+        synchronized (buffer) {
+            buffer.add("EOF");
+        }
     }
 }
 
@@ -61,14 +64,16 @@ public MyConsumer(List<String> buffer, String color) {
 
     public void run() {
         while (true) {
-            if (buffer.isEmpty()) {
-                continue;
-            }
-            if(buffer.get(0).equals(EOF)) {
-                System.out.println(color + "Exiting");
-                break;
-            } else {
-                System.out.println(color + "Removed " + buffer.remove(0));
+            synchronized (buffer) {
+                if (buffer.isEmpty()) {
+                    continue;
+                }
+                if(buffer.get(0).equals(EOF)) {
+                    System.out.println(color + "Exiting");
+                    break;
+                } else {
+                    System.out.println(color + "Removed " + buffer.remove(0));
+                }
             }
         }
     }