>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17622 )
Change subject: [NO ISSUE][HYR][HTTP] Ensure buffer is released on chunked full
response
......................................................................
[NO ISSUE][HYR][HTTP] Ensure buffer is released on chunked full response
Change-Id: Ie62e7b7b66ef8476d530993b96be7ea49df2cbfe
---
M
hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java
1 file changed, 16 insertions(+), 9 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/22/17622/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java
index 9a940b1..9378ae1 100644
---
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java
+++
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java
@@ -81,18 +81,16 @@
@Override
public void close() throws IOException {
if (!closed) {
- if (response.isHeaderSent() || response.status() !=
HttpResponseStatus.OK) {
- try {
+ try {
+ if (response.isHeaderSent() || response.status() !=
HttpResponseStatus.OK) {
flush();
- } finally {
- if (buffer != null) {
- buffer.release();
- }
+ } else {
+ response.fullResponse(buffer);
}
- } else {
- response.fullResponse(buffer);
+ super.close();
+ } finally {
+ ReferenceCountUtil.release(buffer);
}
- super.close();
}
closed = true;
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17622
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: Ie62e7b7b66ef8476d530993b96be7ea49df2cbfe
Gerrit-Change-Number: 17622
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
