root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Close InputStreams in writeResourceRegionCollection (analogous to writeResourceRegion) 

Issue: SPR-15559
This commit is contained in:
Juergen Hoeller 2017-05-17 14:34:50 +02:00
parent 7b3f5fd855
commit eaac348c05
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
View File

@ -40,6 +40,7 @@ import org.springframework.util.StreamUtils;
* or Collections of {@link ResourceRegion ResourceRegions}. * or Collections of {@link ResourceRegion ResourceRegions}.
* *
* @author Brian Clozel * @author Brian Clozel
* @author Juergen Hoeller
* @since 4.3 * @since 4.3
*/ */
public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessageConverter<Object> { public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessageConverter<Object> {
@ -58,7 +59,7 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa
} }
else { else {
Collection<ResourceRegion> regions = (Collection<ResourceRegion>) object; Collection<ResourceRegion> regions = (Collection<ResourceRegion>) object;
if (regions.size() > 0) { if (!regions.isEmpty()) {
resource = regions.iterator().next().getResource(); resource = regions.iterator().next().getResource();
} }
} }
@ -141,6 +142,7 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa
protected void writeResourceRegion(ResourceRegion region, HttpOutputMessage outputMessage) throws IOException { protected void writeResourceRegion(ResourceRegion region, HttpOutputMessage outputMessage) throws IOException {
Assert.notNull(region, "ResourceRegion must not be null"); Assert.notNull(region, "ResourceRegion must not be null");
HttpHeaders responseHeaders = outputMessage.getHeaders(); HttpHeaders responseHeaders = outputMessage.getHeaders();
long start = region.getPosition(); long start = region.getPosition();
long end = start + region.getCount() - 1; long end = start + region.getCount() - 1;
Long resourceLength = region.getResource().contentLength(); Long resourceLength = region.getResource().contentLength();
@ -148,6 +150,7 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa
long rangeLength = end - start + 1; long rangeLength = end - start + 1;
responseHeaders.add("Content-Range", "bytes " + start + '-' + end + '/' + resourceLength); responseHeaders.add("Content-Range", "bytes " + start + '-' + end + '/' + resourceLength);
responseHeaders.setContentLength(rangeLength); responseHeaders.setContentLength(rangeLength);
InputStream in = region.getResource().getInputStream(); InputStream in = region.getResource().getInputStream();
try { try {
StreamUtils.copyRange(in, outputMessage.getBody(), start, end); StreamUtils.copyRange(in, outputMessage.getBody(), start, end);
@ -167,14 +170,17 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa
Assert.notNull(resourceRegions, "Collection of ResourceRegion should not be null"); Assert.notNull(resourceRegions, "Collection of ResourceRegion should not be null");
HttpHeaders responseHeaders = outputMessage.getHeaders(); HttpHeaders responseHeaders = outputMessage.getHeaders();
MediaType contentType = responseHeaders.getContentType(); MediaType contentType = responseHeaders.getContentType();
String boundaryString = MimeTypeUtils.generateMultipartBoundaryString(); String boundaryString = MimeTypeUtils.generateMultipartBoundaryString();
responseHeaders.set(HttpHeaders.CONTENT_TYPE, "multipart/byteranges; boundary=" + boundaryString); responseHeaders.set(HttpHeaders.CONTENT_TYPE, "multipart/byteranges; boundary=" + boundaryString);
OutputStream out = outputMessage.getBody(); OutputStream out = outputMessage.getBody();
for (ResourceRegion region : resourceRegions) { for (ResourceRegion region : resourceRegions) {
long start = region.getPosition(); long start = region.getPosition();
long end = start + region.getCount() - 1; long end = start + region.getCount() - 1;
InputStream in = region.getResource().getInputStream(); InputStream in = region.getResource().getInputStream();
try {
// Writing MIME header. // Writing MIME header.
println(out); println(out);
print(out, "--" + boundaryString); print(out, "--" + boundaryString);
@ -191,6 +197,16 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa
// Printing content // Printing content
StreamUtils.copyRange(in, out, start, end); StreamUtils.copyRange(in, out, start, end);
} }
finally {
try {
in.close();
}
catch (IOException ex) {
// ignore
}
}
}
println(out); println(out);
print(out, "--" + boundaryString + "--"); print(out, "--" + boundaryString + "--");
} }