iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JAVA-18228 Potential issue in "Producer-Consumer Problem With Example… (#13582)

Browse Source 
JAVA-18228 Potential issue in "Producer-Consumer Problem With Example in Java" article
This commit is contained in:
timis1 2023-03-22 10:26:22 +02:00 committed by GitHub
parent 4fdc89218c
commit 163056b1ca
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/Consumer.java
View File

@ -2,11 +2,9 @@ package com.baeldung.producerconsumer;
public class Consumer implements Runnable {
private final DataQueue dataQueue;
private volatile boolean runFlag;
public Consumer(DataQueue dataQueue) {
this.dataQueue = dataQueue;
runFlag = true;
}
@Override
@ -15,9 +13,9 @@ public class Consumer implements Runnable {
}
public void consume() {
while (runFlag) {
Message message;
if (dataQueue.isEmpty()) {
while (dataQueue.runFlag) {
synchronized (this) {
while (dataQueue.isEmpty() && dataQueue.runFlag) {
try {
dataQueue.waitOnEmpty();
} catch (InterruptedException e) {
@ -25,13 +23,14 @@ public class Consumer implements Runnable {
break;
}
}
if (!runFlag) {
if (!dataQueue.runFlag) {
break;
}
message = dataQueue.remove();
Message message = dataQueue.remove();
dataQueue.notifyAllForFull();
useMessage(message);
}
}
System.out.println("Consumer Stopped");
}
@ -45,7 +44,7 @@ public class Consumer implements Runnable {
}
public void stop() {
runFlag = false;
dataQueue.runFlag = false;
dataQueue.notifyAllForEmpty();
}
}

2
core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/DataQueue.java
View File

@ -9,6 +9,8 @@ public class DataQueue {
private final Object FULL_QUEUE = new Object();
private final Object EMPTY_QUEUE = new Object();
public boolean runFlag = true;
DataQueue(int maxSize) {
this.maxSize = maxSize;
}

14
core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/Producer.java
View File

@ -2,13 +2,11 @@ package com.baeldung.producerconsumer;
public class Producer implements Runnable {
private final DataQueue dataQueue;
private volatile boolean runFlag;
private static int idSequence = 0;
public Producer(DataQueue dataQueue) {
this.dataQueue = dataQueue;
runFlag = true;
}
@Override
@ -17,9 +15,9 @@ public class Producer implements Runnable {
}
public void produce() {
while (runFlag) {
Message message = generateMessage();
while (dataQueue.isFull()) {
while (dataQueue.runFlag) {
synchronized (this) {
while (dataQueue.isFull() && dataQueue.runFlag) {
try {
dataQueue.waitOnFull();
} catch (InterruptedException e) {
@ -27,12 +25,14 @@ public class Producer implements Runnable {
break;
}
}
if (!runFlag) {
if (!dataQueue.runFlag) {
break;
}
Message message = generateMessage();
dataQueue.add(message);
dataQueue.notifyAllForEmpty();
}
}
System.out.println("Producer Stopped");
}
@ -47,7 +47,7 @@ public class Producer implements Runnable {
}
public void stop() {
runFlag = false;
dataQueue.runFlag = false;
dataQueue.notifyAllForFull();
}
}