Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CXF-7585] Close InputStream in AttachmentSerializer when base64 encoding is used #355

Merged
merged 1 commit into from
Dec 8, 2017
Merged

[CXF-7585] Close InputStream in AttachmentSerializer when base64 encoding is used #355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,9 @@ public void writeAttachments() throws IOException {
headers, writer);
out.write(writer.getBuffer().toString().getBytes(encoding));
if ("base64".equals(contentTransferEncoding)) {
encodeBase64(handler.getInputStream(), out, IOUtils.DEFAULT_BUFFER_SIZE);
try (InputStream inputStream = handler.getInputStream()) {
encodeBase64(inputStream, out, IOUtils.DEFAULT_BUFFER_SIZE);
}
} else {
handler.writeTo(out);
}
Expand Down Expand Up @@ -308,7 +310,7 @@ private int encodeBase64(InputStream input, OutputStream output, int bufferSize)
if (n == 0) {
throw new IOException("0 bytes read in violation of InputStream.read(byte[])");
}
Base64Utility.encodeAndStream(buffer, 0, n, out);
Base64Utility.encodeAndStream(buffer, 0, n, output);
total += n;
n = input.read(buffer);
}
Expand Down