svn commit: r1700977 - /tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

[markt]

Author: markt
Date: Thu Sep  3 10:21:17 2015
New Revision: 1700977

URL: http://svn.apache.org/r1700977
Log:
Testing access log entries may be accessed concurrently so ensure that access 
is thread safe.

Modified:
    tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1700977&r1=1700976&r2=1700977&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Thu 
Sep  3 10:21:17 2015
@@ -17,8 +17,8 @@
 package org.apache.catalina.valves;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 import javax.servlet.ServletException;
 
@@ -36,7 +36,7 @@ public class TesterAccessLogValve extend
     // Timing tests need an error margin to prevent failures.
     private static final long ERROR_MARGIN = RELAX_TIMING ? 1000 : 100;
 
-    private final List<Entry> entries = new ArrayList<>();
+    private final Queue<Entry> entries = new ConcurrentLinkedQueue<>();
 
     public TesterAccessLogValve() {
         // Async requests are supported
@@ -86,8 +86,7 @@ public class TesterAccessLogValve extend
             entriesLog.append(System.lineSeparator());
         }
         assertEquals(entriesLog.toString(), count, entries.size());
-        for (int j = 0; j < count; j++) {
-            Entry entry = entries.get(j);
+        for (Entry entry : entries) {
             assertEquals(status, entry.getStatus());
             assertTrue(entry.toString() + " duration is not >= " + (minTime - 
ERROR_MARGIN),
                     entry.getTime() >= minTime - ERROR_MARGIN);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org