[bookkeeper] branch master updated: Issue #1696: fixed potential ConcurrentModificationException in mock in MdcContextTest

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 7d7c88e  Issue #1696: fixed potential ConcurrentModificationException in mock in MdcContextTest
7d7c88e is described below

commit 7d7c88e46baf17c2893585c6d7d958df6e92f0c0
Author: Andrey Yegorov <dl...@users.noreply.github.com>
AuthorDate: Wed Sep 26 11:25:40 2018 -0700

    Issue #1696: fixed potential ConcurrentModificationException in mock in MdcContextTest
    
    Descriptions of the changes in this PR:
    
    Changed LinkedList to ConcurrentLinkedQueue to avoid potential ConcurrentModificationException in callbacks.
    
    ### Motivation
    
    Test flapped.
    
    ### Changes
    
    (Describe: what changes you have made)
    
    Master Issue: #1696
    
    
    
    
    Author: Charan Reddy Guttapalem <re...@gmail.com>
    Author: Qi Wang <42...@users.noreply.github.com>
    Author: Sijie Guo <gu...@gmail.com>
    Author: Andrey Yegorov <ay...@salesforce.com>
    
    Reviewers: Venkateswararao Jujjuri (JV) <None>, Enrico Olivelli <eo...@gmail.com>, Sijie Guo <si...@apache.org>
    
    This closes #1699 from dlg99/fix/issue_1696_MdcContextTest, closes #1696
---
 .../test/java/org/apache/bookkeeper/client/MdcContextTest.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 f10427b..535b97a 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.mock;
 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 @@ public class MdcContextTest extends BookKeeperClusterTestCase {
     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 class MdcContextTest extends BookKeeperClusterTestCase {
 
         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())