manual merge of #125

fehguy · fehguy · commit 5892fdb2bb8a · 2014-01-16T20:34:26.000-08:00
diff --git a/src/main/resources/android-java/apiInvoker.mustache b/src/main/resources/android-java/apiInvoker.mustache
@@ -156,8 +156,11 @@ public class ApiInvoker {
       }
       else if ("POST".equals(method)) {
         HttpPost post = new HttpPost(url);
-        post.setHeader("Content-Type", contentType);
-        post.setEntity(new StringEntity(serialize(body), "UTF-8"));
+
+        if (body != null) {
+          post.setHeader("Content-Type", contentType);
+          post.setEntity(new StringEntity(serialize(body), "UTF-8"));
+        }
         for(String key : headers.keySet()) {
           post.setHeader(key, headers.get(key));
         }

Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,11 @@ public class ApiInvoker {`
`156`	`156`	`}`
`157`	`157`	`else if ("POST".equals(method)) {`
`158`	`158`	`HttpPost post = new HttpPost(url);`
`159`		`- post.setHeader("Content-Type", contentType);`
`160`		`- post.setEntity(new StringEntity(serialize(body), "UTF-8"));`
	`159`	`+`
	`160`	`+ if (body != null) {`
	`161`	`+ post.setHeader("Content-Type", contentType);`
	`162`	`+ post.setEntity(new StringEntity(serialize(body), "UTF-8"));`
	`163`	`+ }`
`161`	`164`	`for(String key : headers.keySet()) {`
`162`	`165`	`post.setHeader(key, headers.get(key));`
`163`	`166`	`}`