Merge remote-tracking branch 'origin/master' into java-global-security

Author: xhh

modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache

@@ -365,8 +365,10 @@ public class ApiInvoker {
 
       int code = response.getStatusLine().getStatusCode();
       String responseString = null;
-      if(code == 204)
+      if(code == 204) {
         responseString = "";
+        return responseString;
+      }
       else if(code >= 200 && code < 300) {
         if(response.getEntity() != null) {
           HttpEntity resEntity = response.getEntity();

samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java

@@ -365,8 +365,10 @@ else if ("PATCH".equals(method)) {
 
       int code = response.getStatusLine().getStatusCode();
       String responseString = null;
-      if(code == 204)
+      if(code == 204) {
         responseString = "";
+        return responseString;
+      }
       else if(code >= 200 && code < 300) {
         if(response.getEntity() != null) {
           HttpEntity resEntity = response.getEntity();