Skip to content

Fix memory leak in netty implementation of DockerCmdExecFactory #563

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
marcuslinke merged 1 commit into from
May 2, 2016
Merged

Fix memory leak in netty implementation of DockerCmdExecFactory #563

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public FramedResponseStreamHandler(ResultCallback<Frame> resultCallback) {
@Override
protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {

rawBuffer.writeBytes(msg.copy(), 0, msg.readableBytes());
rawBuffer.writeBytes(msg, 0, msg.readableBytes());

Frame frame = null;

Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ public void close() {
}

private String getBodyAsMessage(ByteBuf body) {
return body.readBytes(body.readableBytes()).toString(Charset.forName("UTF-8"));
String result = body.readBytes(body.readableBytes()).toString(Charset.forName("UTF-8"));
body.discardReadBytes();
body.release();
return result;
}
}
1 change: 1 addition & 0 deletions src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public JsonResponseCallbackHandler(TypeReference<T> typeReference, ResultCallbac
protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
byte[] buffer = new byte[msg.readableBytes()];
msg.readBytes(buffer);
msg.discardReadBytes();

T object = null;

Expand Down