Merge pull request square#92 from square/jw/synchronous-post

Only exclude the last param if execution is not synchronous.
harsa · Oct 30, 2012 · 6de6206 · 6de6206
2 parents fba17d4 + bfeaea1
commit 6de6206
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/retrofit/src/main/java/retrofit/http/HttpMethodType.java b/retrofit/src/main/java/retrofit/http/HttpMethodType.java
@@ -105,7 +105,10 @@ private static void addParams(HttpEntityEnclosingRequestBase request, HttpReques
     Class<?>[] parameterTypes = method.getParameterTypes();
 
     Annotation[][] parameterAnnotations = method.getParameterAnnotations();
-    int count = parameterAnnotations.length - 1;
+    int count = parameterAnnotations.length;
+    if (!builder.isSynchronous()) {
+      count -= 1;
+    }
 
     if (useMultipart(parameterTypes, parameterAnnotations)) {
       MultipartEntity form = new MultipartEntity(HttpMultipartMode.BROWSER_COMPATIBLE);

diff --git a/retrofit/src/main/java/retrofit/http/HttpRequestBuilder.java b/retrofit/src/main/java/retrofit/http/HttpRequestBuilder.java
@@ -57,6 +57,10 @@ Method getMethod() {
     return javaMethod;
   }
 
+  boolean isSynchronous() {
+    return isSynchronous;
+  }
+
   String getRelativePath() {
     return replacedRelativePath != null ? replacedRelativePath : requestLine.getRelativePath();
   }