Commit bf56b24c authored by Andy Wilkinson's avatar Andy Wilkinson

Merge pull request #11779 from rajadilipkolli

* gh-11779:
  Use try-with-resources in HttpTunnelPayload

Closes gh-11779
parents 9d3586d0 abcff3a3
...@@ -84,11 +84,11 @@ public class HttpTunnelPayload { ...@@ -84,11 +84,11 @@ public class HttpTunnelPayload {
headers.setContentLength(this.data.remaining()); headers.setContentLength(this.data.remaining());
headers.add(SEQ_HEADER, Long.toString(getSequence())); headers.add(SEQ_HEADER, Long.toString(getSequence()));
headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
WritableByteChannel body = Channels.newChannel(message.getBody()); try (WritableByteChannel body = Channels.newChannel(message.getBody())) {
while (this.data.hasRemaining()) { while (this.data.hasRemaining()) {
body.write(this.data); body.write(this.data);
}
} }
body.close();
} }
/** /**
...@@ -117,14 +117,14 @@ public class HttpTunnelPayload { ...@@ -117,14 +117,14 @@ public class HttpTunnelPayload {
} }
String seqHeader = message.getHeaders().getFirst(SEQ_HEADER); String seqHeader = message.getHeaders().getFirst(SEQ_HEADER);
Assert.state(StringUtils.hasLength(seqHeader), "Missing sequence header"); Assert.state(StringUtils.hasLength(seqHeader), "Missing sequence header");
ReadableByteChannel body = Channels.newChannel(message.getBody()); try (ReadableByteChannel body = Channels.newChannel(message.getBody())) {
ByteBuffer payload = ByteBuffer.allocate((int) length); ByteBuffer payload = ByteBuffer.allocate((int) length);
while (payload.hasRemaining()) { while (payload.hasRemaining()) {
body.read(payload); body.read(payload);
}
payload.flip();
return new HttpTunnelPayload(Long.valueOf(seqHeader), payload);
} }
body.close();
payload.flip();
return new HttpTunnelPayload(Long.valueOf(seqHeader), payload);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment