Merge branch 'master-docker-java'

vuminhkh · vuminhkh · commit 4aad2eaa7a50 · 2016-05-05T20:35:11.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ Notes
 
 All changes
 
+* [#563] (https://github.com/docker-java/docker-java/pull/563) Fix memory leak in netty implementation of DockerCmdExecFactory
+
 Included in 3.0.0-RC5
 
 * [#542] (https://github.com/docker-java/docker-java/pull/542) Fix large volumes of output from "docker exec" trigger out of memory error
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
@@ -37,7 +37,7 @@ protected List<Container> execute(ListContainersCmd command) {
             webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));
         }
 
-        if (command.getFilters() != null) {
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
                     .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
@@ -36,7 +36,7 @@ protected List<Container> execute(ListContainersCmd command) {
             webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));
         }
 
-        if (command.getFilters() != null) {
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
                     .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
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
`@@ -37,7 +37,7 @@ protected List<Container> execute(ListContainersCmd command) {`
`37`	`37`	`webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));`
`38`	`38`	`}`
`39`	`39`
`40`		`- if (command.getFilters() != null) {`
	`40`	`+ if (command.getFilters() != null && !command.getFilters().isEmpty()) {`
`41`	`41`	`webTarget = webTarget`
`42`	`42`	`.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected List<Container> execute(ListContainersCmd command) {`
`36`	`36`	`webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));`
`37`	`37`	`}`
`38`	`38`
`39`		`- if (command.getFilters() != null) {`
	`39`	`+ if (command.getFilters() != null && !command.getFilters().isEmpty()) {`
`40`	`40`	`webTarget = webTarget`
`41`	`41`	`.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));`
`42`	`42`	`}`
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`	`}`