Compute Content-Length in constructor

Author: Stephane Landelle

src/main/java/com/ning/http/multipart/MultipartRequestEntity.java

@@ -19,9 +19,6 @@
 
 import com.ning.http.client.FluentCaseInsensitiveStringsMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Random;
@@ -57,16 +54,16 @@ public static byte[] generateMultipartBoundary() {
         return bytes;
     }
 
-    private final Logger log = LoggerFactory.getLogger(MultipartRequestEntity.class);
-
     /**
      * The MIME parts as set by the constructor
      */
-    protected Part[] parts;
+    protected final Part[] parts;
 
     private final byte[] multipartBoundary;
 
     private final String contentType;
+    
+    private final long contentLength;
 
     /**
      * Creates a new multipart entity containing the given parts.
@@ -93,6 +90,8 @@ public MultipartRequestEntity(Part[] parts, FluentCaseInsensitiveStringsMap requ
         	multipartBoundary = generateMultipartBoundary();
             contentType = computeContentType(MULTIPART_FORM_CONTENT_TYPE);
         }
+        
+        contentLength = Part.getLengthOfParts(parts, multipartBoundary);
     }
 
     private String computeContentType(String base) {
@@ -128,12 +127,7 @@ public void writeRequest(OutputStream out) throws IOException {
     }
 
     public long getContentLength() {
-        try {
-            return Part.getLengthOfParts(parts, multipartBoundary);
-        } catch (Exception e) {
-            log.error("An exception occurred while getting the length of the parts", e);
-            return 0L;
-        }
+        return contentLength;
     }
 
     public String getContentType() {

src/main/java/com/ning/http/multipart/Part.java

@@ -18,13 +18,18 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * This class is an adaptation of the Apache HttpClient implementation
  * 
  * @link http://hc.apache.org/httpclient-3.x/
  */
 public abstract class Part implements com.ning.http.client.Part {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(Part.class);
+
     /**
      * Carriage return/linefeed
      */
@@ -443,21 +448,27 @@ public static void sendPart(OutputStream out, Part part, byte[] partBoundary) th
      * @since 3.0
      */
     public static long getLengthOfParts(Part[] parts, byte[] partBoundary) {
-        if (parts == null) {
-            throw new IllegalArgumentException("Parts may not be null");
-        }
-        long total = 0;
-        for (Part part : parts) {
-            long l = part.length(partBoundary);
-            if (l < 0) {
-                return -1;
+        
+        try {
+            if (parts == null) {
+                throw new IllegalArgumentException("Parts may not be null");
+            }
+            long total = 0;
+            for (Part part : parts) {
+                long l = part.length(partBoundary);
+                if (l < 0) {
+                    return -1;
+                }
+                total += l;
             }
-            total += l;
+            total += EXTRA_BYTES.length;
+            total += partBoundary.length;
+            total += EXTRA_BYTES.length;
+            total += CRLF_BYTES.length;
+            return total;
+        } catch (Exception e) {
+            LOGGER.error("An exception occurred while getting the length of the parts", e);
+            return 0L;
         }
-        total += EXTRA_BYTES.length;
-        total += partBoundary.length;
-        total += EXTRA_BYTES.length;
-        total += CRLF_BYTES.length;
-        return total;
     }
 }