Skip to content

BytesFullResponseHandler should only consume readableBytes of ChannelBuffer #6270

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

Merged
jon-wei merged 1 commit into from
Aug 31, 2018
Merged

BytesFullResponseHandler should only consume readableBytes of ChannelBuffer #6270

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...rc/main/java/org/apache/druid/security/basic/authentication/BytesFullResponseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.druid.java.util.http.client.response.ClientResponse;
import org.apache.druid.java.util.http.client.response.FullResponseHolder;
import org.apache.druid.java.util.http.client.response.HttpResponseHandler;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.handler.codec.http.HttpChunk;
import org.jboss.netty.handler.codec.http.HttpResponse;

Expand All @@ -36,7 +37,7 @@ public ClientResponse<FullResponseHolder> handleResponse(HttpResponse response)
null
);

holder.addChunk(response.getContent().array());
holder.addChunk(getContentBytes(response.getContent()));

return ClientResponse.unfinished(
holder
Expand All @@ -55,7 +56,7 @@ public ClientResponse<FullResponseHolder> handleChunk(
return ClientResponse.finished(null);
}

holder.addChunk(chunk.getContent().array());
holder.addChunk(getContentBytes(chunk.getContent()));
return response;
}

Expand All @@ -72,4 +73,11 @@ public void exceptionCaught(
{
// Its safe to Ignore as the ClientResponse returned in handleChunk were unfinished
}

private byte[] getContentBytes(ChannelBuffer content)
{
byte[] contentBytes = new byte[content.readableBytes()];
content.readBytes(contentBytes);
return contentBytes;
}
}