diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2016-12-12 10:11:54 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2016-12-12 10:11:54 +0100 |
| commit | 4c1d8be89bbfa14f38d4a8eff1c2ebe6b7f88e73 (patch) | |
| tree | 46a577601edf3ae865fd49da04414b64d670fa52 /jdisc_http_service/src | |
| parent | 2c752e6694bef5507625702260479e92f62eb749 (diff) | |
Fix race condition in some http conformance test
Make call to Exception.getMessage()/getReasonPhrase in synchronized
block to fix some flaky unit tests (eg testRequestContentCloseExceptionBeforeResponseWrite)
Diffstat (limited to 'jdisc_http_service/src')
| -rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java | 5 |
1 files changed, 2 insertions, 3 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 89b80ef195c..f90e0e8c856 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 @@ -99,11 +99,10 @@ public class ServletResponseController { public void trySendError(Throwable t) { - String reasonPhrase = getReasonPhrase(t, developerMode); - int statusCode = getStatusCode(t); - final boolean responseWasCommitted; try { + String reasonPhrase = getReasonPhrase(t, developerMode); + int statusCode = getStatusCode(t); synchronized (monitor) { responseWasCommitted = responseCommitted; if (!responseCommitted) { |