Author: markt
Date: Tue Dec 17 00:49:35 2013
New Revision: 1551428
URL: http://svn.apache.org/r1551428
Log:
Observed strange lock-up on OSX when two threads were writing concurrently to
this Map. Switch to ConcurrentHashMap in an attempt to avoid the lock-up in
future.
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1551428&r1=1551427&r2=1551428&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
Tue Dec 17 00:49:35 2013
@@ -21,10 +21,10 @@ import java.net.URI;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Queue;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import javax.servlet.ServletContextEvent;
@@ -293,7 +293,7 @@ public class TestEncodingDecoding extend
public static class Server {
private Queue<Object> received = new ConcurrentLinkedQueue<>();
- static HashMap<String, Boolean> lifeCyclesCalled = new HashMap<>(8);
+ static Map<String, Boolean> lifeCyclesCalled = new
ConcurrentHashMap<>(8);
@OnMessage
public MsgString rx(MsgString in) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
