From 1b4a41928e6b41d91c75480be20edb85f07e09a0 Mon Sep 17 00:00:00 2001 From: Andrew Bjonnes Date: Thu, 29 Nov 2018 12:44:36 -0500 Subject: [PATCH] Fix header passthrough on DICOM forwarding (0th header key may be null when the 0th header value is the HTTP status line) --- .../src/main/java/ca/uhn/fhir/jpa/demo/WadoRsInterceptor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/WadoRsInterceptor.java b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/WadoRsInterceptor.java index e660083..830dd70 100644 --- a/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/WadoRsInterceptor.java +++ b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/WadoRsInterceptor.java @@ -130,9 +130,9 @@ private void forwardRequest(String prefix, HttpServletRequest req, HttpServletRe resp.setStatus(conn.getResponseCode()); for (int i = 0; ; ++i) { final String header = conn.getHeaderFieldKey(i); - if (header == null) break; final String value = conn.getHeaderField(i); - resp.setHeader(header, value); + if (header == null && value == null) break; + if (header != null) resp.setHeader(header, value); } InputStream is = conn.getInputStream();