summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-01-12 16:45:17 +0100
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-01-12 16:45:17 +0100
commitf28502fedb0d6afa49409d5ecf342d27bb38c6fa (patch)
treef14560aac63f69308fa109d3d4005e922af0426f /jdisc_http_service
parentd89de4d0f4ef794a36c5e0a0c0b1824f94f4ca5f (diff)
Fix race condition in some http conformance test
Make call to Exception.getMessage()/getReasonPhrase in synchronized block to fix some flaky unit tests (e.g. testRequestContentCloseExceptionBeforeResponseWrite)
Diffstat (limited to 'jdisc_http_service')
-rw-r--r--jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
index f90e0e8c856..a06d39ed016 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
@@ -101,9 +101,9 @@ public class ServletResponseController {
public void trySendError(Throwable t) {
final boolean responseWasCommitted;
try {
- String reasonPhrase = getReasonPhrase(t, developerMode);
- int statusCode = getStatusCode(t);
synchronized (monitor) {
+ String reasonPhrase = getReasonPhrase(t, developerMode);
+ int statusCode = getStatusCode(t);
responseWasCommitted = responseCommitted;
if (!responseCommitted) {
responseCommitted = true;