Fix Issue #110

Marcus Linke · Marcus Linke · commit 06fea216b583 · 2015-02-06T20:49:14.000+01:00
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -81,6 +81,8 @@ public Iterable<EventStreamItem> getItems() throws IOException {
       ObjectReader reader = mapper.reader(EventStreamItem.class);
       // and then do other configuration, if any, and read:
       Iterator<EventStreamItem> items = reader.readValues(proxy);
+      
+      proxy.close();
 
       return ImmutableList.copyOf(items);
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
@@ -30,7 +30,7 @@ protected InputStream execute(CopyFileFromContainerCmd command) {
 
 		LOGGER.trace("POST: " + webResource.toString());
 		
-		return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).post(entity(command, MediaType.APPLICATION_JSON), Response.class).readEntity(InputStream.class);		
+		return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).post(entity(command, MediaType.APPLICATION_JSON)).readEntity(InputStream.class);		
 	}
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
@@ -23,6 +23,7 @@ protected Info execute(InfoCmd command) {
 		WebTarget webResource = getBaseResource().path("/info");
 
 		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON).get(Info.class);	}
+		return webResource.request().accept(MediaType.APPLICATION_JSON).get(Info.class);
+	}
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
@@ -29,7 +29,7 @@ protected Void execute(KillContainerCmd command) {
 		}
 
 		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
 		return null;
 	}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -29,7 +29,7 @@ protected InputStream execute(LogContainerCmd command) {
 				.queryParam("tail", command.getTail() < 0 ? "all" : "" + command.getTail());
 
 		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().get(Response.class).readEntity(InputStream.class);
+		return webResource.request().get().readEntity(InputStream.class);
 	}
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
@@ -26,7 +26,7 @@ protected Void execute(PauseContainerCmd command) {
 						command.getContainerId());
 
 		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
 		return null;
 	}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
@@ -21,7 +21,7 @@ protected Void execute(PingCmd command) {
 		WebTarget webResource = getBaseResource().path("/_ping");
 	       
         LOGGER.trace("GET: {}", webResource);
-        webResource.request().get(Response.class);
+        webResource.request().get().close();
         
         return null;
 	}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -74,6 +74,8 @@ public Iterable<PushEventStreamItem> getItems() throws IOException {
       // and then do other configuration, if any, and read:
       Iterator<PushEventStreamItem> items = reader.readValues(proxy);
 
+      proxy.close();
+      
       return ImmutableList.copyOf(items);
     }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
@@ -23,8 +23,7 @@ protected Void execute(RemoveContainerCmd command) {
 				.queryParam("force", command.hasForceEnabled() ? "1" : "0");
 		
 		LOGGER.trace("DELETE: {}", webResource);
-		/*String response = */webResource.request().accept(MediaType.APPLICATION_JSON).delete().close();
-//		LOGGER.trace("Response: {}", response);
+		webResource.request().accept(MediaType.APPLICATION_JSON).delete().close();
 
 		return null;
 	}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
@@ -27,7 +27,7 @@ protected Void execute(RestartContainerCmd command) {
 				.queryParam("t", String.valueOf(command.getTimeout()));
 
 		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
 		return null;
 	}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
@@ -4,6 +4,7 @@
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,8 +24,8 @@ protected Void execute(StartContainerCmd command) {
 		WebTarget webResource = getBaseResource().path("/containers/{id}/start").resolveTemplate("id", command.getContainerId());
 
 		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(entity(command, MediaType.APPLICATION_JSON));
-
+		webResource.request().accept(MediaType.APPLICATION_JSON).post(entity(command, MediaType.APPLICATION_JSON)).close();
+		
 		return null;
 	}
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
@@ -26,7 +26,7 @@ protected Void execute(StopContainerCmd command) {
 				.queryParam("t", String.valueOf(command.getTimeout()));
 
 		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
 		return null;
 	}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
@@ -24,7 +24,7 @@ protected Void execute(TagImageCmd command) {
                 .queryParam("force", command.hasForceEnabled() ? "1" : "0");
 
 		LOGGER.trace("POST: {}", webResource);
-		webResource.request().post(null);
+		webResource.request().post(null).close();
 		return null;
 	}
 	
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
@@ -1,9 +1,7 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,7 +23,7 @@ protected Void execute(UnpauseContainerCmd command) {
 		
 		LOGGER.trace("POST: {}", webResource);
 		webResource.request().accept(MediaType.APPLICATION_JSON)
-				.post(Entity.entity(Response.class, MediaType.APPLICATION_JSON));
+				.post(null).close();
 
 		return null;
 	}

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@ public Iterable<EventStreamItem> getItems() throws IOException {`
`81`	`81`	`ObjectReader reader = mapper.reader(EventStreamItem.class);`
`82`	`82`	`// and then do other configuration, if any, and read:`
`83`	`83`	`Iterator<EventStreamItem> items = reader.readValues(proxy);`
	`84`	`+`
	`85`	`+ proxy.close();`
`84`	`86`
`85`	`87`	`return ImmutableList.copyOf(items);`
`86`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ protected InputStream execute(CopyFileFromContainerCmd command) {`
`30`	`30`
`31`	`31`	`LOGGER.trace("POST: " + webResource.toString());`
`32`	`32`
`33`		`- return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).post(entity(command, MediaType.APPLICATION_JSON), Response.class).readEntity(InputStream.class);`
	`33`	`+ return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).post(entity(command, MediaType.APPLICATION_JSON)).readEntity(InputStream.class);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ protected Info execute(InfoCmd command) {`
`23`	`23`	`WebTarget webResource = getBaseResource().path("/info");`
`24`	`24`
`25`	`25`	`LOGGER.trace("GET: {}", webResource);`
`26`		`- return webResource.request().accept(MediaType.APPLICATION_JSON).get(Info.class); }`
	`26`	`+ return webResource.request().accept(MediaType.APPLICATION_JSON).get(Info.class);`
	`27`	`+ }`
`27`	`28`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected Void execute(KillContainerCmd command) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`LOGGER.trace("POST: {}", webResource);`
`32`		`- webResource.request().accept(MediaType.APPLICATION_JSON).post(null);`
	`32`	`+ webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();`
`33`	`33`
`34`	`34`	`return null;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected InputStream execute(LogContainerCmd command) {`
`29`	`29`	`.queryParam("tail", command.getTail() < 0 ? "all" : "" + command.getTail());`
`30`	`30`
`31`	`31`	`LOGGER.trace("GET: {}", webResource);`
`32`		`- return webResource.request().get(Response.class).readEntity(InputStream.class);`
	`32`	`+ return webResource.request().get().readEntity(InputStream.class);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ protected Void execute(PauseContainerCmd command) {`
`26`	`26`	`command.getContainerId());`
`27`	`27`
`28`	`28`	`LOGGER.trace("POST: {}", webResource);`
`29`		`- webResource.request().accept(MediaType.APPLICATION_JSON).post(null);`
	`29`	`+ webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();`
`30`	`30`
`31`	`31`	`return null;`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ protected Void execute(PingCmd command) {`
`21`	`21`	`WebTarget webResource = getBaseResource().path("/_ping");`
`22`	`22`
`23`	`23`	`LOGGER.trace("GET: {}", webResource);`
`24`		`- webResource.request().get(Response.class);`
	`24`	`+ webResource.request().get().close();`
`25`	`25`
`26`	`26`	`return null;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,8 @@ public Iterable<PushEventStreamItem> getItems() throws IOException {`
`74`	`74`	`// and then do other configuration, if any, and read:`
`75`	`75`	`Iterator<PushEventStreamItem> items = reader.readValues(proxy);`
`76`	`76`
	`77`	`+ proxy.close();`
	`78`	`+`
`77`	`79`	`return ImmutableList.copyOf(items);`
`78`	`80`	`}`
`79`	`81`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ protected Void execute(RemoveContainerCmd command) {`
`23`	`23`	`.queryParam("force", command.hasForceEnabled() ? "1" : "0");`
`24`	`24`
`25`	`25`	`LOGGER.trace("DELETE: {}", webResource);`
`26`		`- /String response = /webResource.request().accept(MediaType.APPLICATION_JSON).delete().close();`
`27`		`-// LOGGER.trace("Response: {}", response);`
	`26`	`+ webResource.request().accept(MediaType.APPLICATION_JSON).delete().close();`
`28`	`27`
`29`	`28`	`return null;`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected Void execute(RestartContainerCmd command) {`
`27`	`27`	`.queryParam("t", String.valueOf(command.getTimeout()));`
`28`	`28`
`29`	`29`	`LOGGER.trace("POST: {}", webResource);`
`30`		`- webResource.request().accept(MediaType.APPLICATION_JSON).post(null);`
	`30`	`+ webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();`
`31`	`31`
`32`	`32`	`return null;`
`33`	`33`	`}`