diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2017-09-20 20:11:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 20:11:28 +0200 |
| commit | 281e135347407443957d3ad420f69552d63efe4a (patch) | |
| tree | 3a58e535bc993b5b1d3614423ddb0c57976ea2ac /jdisc_http_service/src/main | |
| parent | e6120f4dba393a473647d7b242fcfc0a40974b25 (diff) | |
Revert "Use Jetty v9.4.7"
Diffstat (limited to 'jdisc_http_service/src/main')
| -rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java | 3 |
1 files changed, 2 insertions, 1 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 bc14a063cd1..735bf3ed89a 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 @@ -184,7 +184,8 @@ public class ServletResponseController { private static void setHeaders_holdingLock(Response jdiscResponse, HttpServletResponse servletResponse) { for (final Map.Entry<String, String> entry : jdiscResponse.headers().entries()) { - servletResponse.addHeader(entry.getKey(), entry.getValue()); + final String value = entry.getValue(); + servletResponse.addHeader(entry.getKey(), value != null ? value : ""); } if (servletResponse.getContentType() == null) { |