Skip to content

Commit

Permalink
#103 make the Dispatcher more thread-safe
Browse files Browse the repository at this point in the history
  • Loading branch information
andrzejchm committed Jul 23, 2019
1 parent 855ab32 commit 3189078
Showing 1 changed file with 9 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
import java.io.StringWriter;
import java.util.LinkedList;
import java.util.List;

import java.util.concurrent.CopyOnWriteArrayList;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.RecordedRequest;

class MatchableCallsRequestDispatcher extends Dispatcher {

private List<MatchableCall> matchableCalls;
private List<RecordedRequest> requestsHistory = new LinkedList<>();
private List<RecordedRequest> requestsHistory = new CopyOnWriteArrayList<>();

public MatchableCallsRequestDispatcher() {
matchableCalls = new LinkedList<>();
matchableCalls = new CopyOnWriteArrayList<>();
}

@Override
Expand Down Expand Up @@ -62,8 +62,12 @@ private MockResponse onTooManyResponsesMatched(RecordedRequest recordedRequest,

private MockResponse onNoResponsesMatched(RecordedRequest recordedRequest) {
RESTMockServer.getLogger()
.error("<- Response ERROR:\t" + RESTMockServer.RESPONSE_NOT_MOCKED + ": " + recordedRequest
+ "\n list of mocked requests:\n" + prepareAllMocksMessage());
.error("<- Response ERROR:\t"
+ RESTMockServer.RESPONSE_NOT_MOCKED
+ ": "
+ recordedRequest
+ "\n list of mocked requests:\n"
+ prepareAllMocksMessage());
return createNotMockedResponse(recordedRequest.getMethod());
}

Expand Down

0 comments on commit 3189078

Please # to comment.