sijie closed pull request #1699: Issue #1696: fixed potential
ConcurrentModificationException in mock in MdcContextTest
URL: https://github.com/apache/bookkeeper/pull/1699
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MdcContextTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MdcContextTest.java
index f10427b8b9..535b97a4b5 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MdcContextTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MdcContextTest.java
@@ -32,8 +32,8 @@
import static org.mockito.Mockito.when;
import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
import lombok.extern.slf4j.Slf4j;
@@ -69,7 +69,7 @@
LedgerHandle lh;
private Appender mockAppender;
- private List<String> capturedEvents;
+ private Queue<String> capturedEvents;
private Logger rootLogger = LogManager.getRootLogger();
public MdcContextTest() {
@@ -122,7 +122,7 @@ public void setUp() throws Exception {
rootLogger.addAppender(mockAppender);
rootLogger.setLevel(Level.INFO);
- capturedEvents = new LinkedList<>();
+ capturedEvents = new ConcurrentLinkedQueue<>();
doAnswer(answerVoid((LoggingEvent event) -> capturedEvents.add(
mdcFormat(event.getMDC(MDC_REQUEST_ID),
event.getRenderedMessage())
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
