Merge pull request #563 from docker-java/issue-556

marcuslinke · marcuslinke · commit 7c8d2d890a39 · 2016-05-02T21:48:02.000+02:00
Fix memory leak in netty implementation of DockerCmdExecFactory
diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -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;
 
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
@@ -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;
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,9 @@ public void close() {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`private String getBodyAsMessage(ByteBuf body) {`
`123`		`- return body.readBytes(body.readableBytes()).toString(Charset.forName("UTF-8"));`
	`123`	`+ String result = body.readBytes(body.readableBytes()).toString(Charset.forName("UTF-8"));`
	`124`	`+ body.discardReadBytes();`
	`125`	`+ body.release();`
	`126`	`+ return result;`
`124`	`127`	`}`
`125`	`128`	`}`