diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 12:28:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 12:28:38 +0100 |
| commit | bf2e067bf4463fe6dee743e5f3f98054a2c9c33f (patch) | |
| tree | 920b80838f7131c25d34a6ce5e94f9335ad0e1dc /jdisc_http_service | |
| parent | 599eaa5ff31689cf0af12f8f09ae10fc6474884a (diff) | |
| parent | 4c1d8be89bbfa14f38d4a8eff1c2ebe6b7f88e73 (diff) | |
Merge pull request #1300 from yahoo/bjorncs/fix-unit-test-race-condition
Fix race condition in some http conformance test
Diffstat (limited to 'jdisc_http_service')
| -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) { |