Phillip Webb 8ffaa54e74 Merge branch '1.5.x'

2017-01-23 23:45:44 -08:00

..

main

Avoid synchronizing on this and use an internal monitor instead

2016-07-01 10:44:23 +01:00

test/java/samples/websocket/tomcat

Merge branch '1.5.x'

2017-01-23 23:45:44 -08:00