honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly handle response streams in JAX-RS client

This commit is contained in:
James Agnew 2018-11-19 12:57:48 -05:00
parent 5d6491b4e4
commit 6a08e46f76
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpResponse.java
View File

@ -1,6 +1,6 @@
package ca.uhn.fhir.jaxrs.client;
import java.io.IOException;
import java.io.*;
/*
* #%L
@ -22,9 +22,6 @@ import java.io.IOException;
* #L%
*/
import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@ -34,9 +31,11 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import ca.uhn.fhir.rest.client.impl.BaseHttpResponse;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.util.StopWatch;
import ca.uhn.fhir.rest.client.api.IHttpResponse;
import org.apache.commons.io.IOUtils;
/**
* A Http Response based on JaxRs. This is an adapter around the class {@link javax.ws.rs.core.Response Response}
@ -118,7 +117,11 @@ public class JaxRsHttpResponse extends BaseHttpResponse implements IHttpResponse
@Override
public InputStream readEntity() {
return myResponse.readEntity(java.io.InputStream.class);
if (!myBufferedEntity && !myResponse.hasEntity()) {
return new ByteArrayInputStream(new byte[0]);
} else {
return new ByteArrayInputStream(myResponse.readEntity(byte[].class));
}
}
@Override