Skip to content

Commit

Permalink
Merge pull request #64 from OiCMudkips/concurrency
Browse files Browse the repository at this point in the history
Fix concurrency issue
  • Loading branch information
fshutdown committed Aug 31, 2021
2 parents fb3e353 + a037bc0 commit 928fbab
Showing 1 changed file with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
import java.io.IOException;
import java.util.Deque;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

Expand Down Expand Up @@ -37,7 +38,7 @@ public class ServiceSocket {
protected final WebSocketSampler parent;
protected WebSocketClient client;
private static final Logger log = LoggingManager.getLoggerForClass();
protected Deque<String> responeBacklog = new LinkedList<String>();
protected Queue<String> responseBacklog = new ConcurrentLinkedQueue<>();
protected Integer error = 0;
protected StringBuffer logMessage = new StringBuffer();
protected CountDownLatch openLatch = new CountDownLatch(1);
Expand Down Expand Up @@ -138,13 +139,13 @@ public void onClose(int statusCode, String reason) {
}

/**
* @return response message made of messages saved in the responeBacklog cache
* @return response message made of messages saved in the responseBacklog cache
*/
public String getResponseMessage() {
String responseMessage = "";

//Iterate through response messages saved in the responeBacklog cache
Iterator<String> iterator = responeBacklog.iterator();
//Iterate through response messages saved in the responseBacklog cache
Iterator<String> iterator = responseBacklog.iterator();
while (iterator.hasNext()) {
responseMessage += iterator.next();
}
Expand Down Expand Up @@ -279,9 +280,9 @@ private void addResponseMessage(String message) {
messageBacklog = WebSocketSampler.MESSAGE_BACKLOG_COUNT;
}

while (responeBacklog.size() >= messageBacklog) {
responeBacklog.poll();
while (responseBacklog.size() >= messageBacklog) {
responseBacklog.poll();
}
responeBacklog.add(message);
responseBacklog.add(message);
}
}

0 comments on commit 928fbab

Please sign in to comment.