Fixed issue with StartContainerCmd

patelrit · patelrit · commit 8a6441ce95d3 · 2014-07-14T10:01:49.000-07:00
The accept header was being set incorrectly to text instead of json.
Also added a defensive null check in JsonClientFilter.
diff --git a/src/main/java/com/github/dockerjava/client/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/client/command/StartContainerCmd.java
@@ -88,7 +88,7 @@ protected Void impl() throws DockerException {
 
 		try {
 			LOGGER.trace("POST: {}", webResource);
-			Builder builder = webResource.accept(MediaType.TEXT_PLAIN);
+			Builder builder = webResource.accept(MediaType.APPLICATION_JSON);
 			if (startContainerConfig != null) {
 				builder.type(MediaType.APPLICATION_JSON).post(startContainerConfig);
 			} else {
diff --git a/src/main/java/com/github/dockerjava/client/utils/JsonClientFilter.java b/src/main/java/com/github/dockerjava/client/utils/JsonClientFilter.java
@@ -16,7 +16,7 @@ public ClientResponse handle(ClientRequest cr) {
         // Call the next filter
         ClientResponse resp = getNext().handle(cr);
         String respContentType = resp.getHeaders().getFirst("Content-Type");
-        if (respContentType.startsWith("text/plain")) {
+        if (respContentType != null && respContentType.startsWith("text/plain")) {
             String newContentType = "application/json" + respContentType.substring(10);
             resp.getHeaders().putSingle("Content-Type", newContentType);
         }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public ClientResponse handle(ClientRequest cr) {`
`16`	`16`	`// Call the next filter`
`17`	`17`	`ClientResponse resp = getNext().handle(cr);`
`18`	`18`	`String respContentType = resp.getHeaders().getFirst("Content-Type");`
`19`		`- if (respContentType.startsWith("text/plain")) {`
	`19`	`+ if (respContentType != null && respContentType.startsWith("text/plain")) {`
`20`	`20`	`String newContentType = "application/json" + respContentType.substring(10);`
`21`	`21`	`resp.getHeaders().putSingle("Content-Type", newContentType);`
`22`	`22`	`}`