Fixed issue restlet#720, complete the content-type header with the right boundary parameter value when using multipart representations. Reported by xwen97.

thboileau · thboileau · commit cac39fa43319 · 2014-01-07T17:37:50.000+01:00
diff --git a/modules/org.restlet.ext.html/src/org/restlet/ext/html/FormDataSet.java b/modules/org.restlet.ext.html/src/org/restlet/ext/html/FormDataSet.java
@@ -263,6 +263,9 @@ public boolean isMultipart() {
      */
     public void setMultipart(boolean multipart) {
         this.multipart = multipart;
+        if (this.multipart && getMultipartBoundary() == null) {
+            this.multipartBoundary = DEFAULT_BOUNDARY;
+        }
         setMediaType(createMultipartMediaType(getMultipartBoundary()));
     }
 
@@ -273,7 +276,13 @@ public void setMultipart(boolean multipart) {
      *            The boundary separating multipart entries.
      */
     public void setMultipartBoundary(String boundary) {
-        this.multipartBoundary = boundary;
+        if (boundary != null) {
+            this.multipartBoundary = boundary;
+            setMultipart(true);
+        } else {
+            this.multipartBoundary = DEFAULT_BOUNDARY;
+        }
+        setMediaType(createMultipartMediaType(getMultipartBoundary()));
     }
 
     @Override
diff --git a/modules/org.restlet.test/src/org/restlet/test/ext/html/FormTestCase.java b/modules/org.restlet.test/src/org/restlet/test/ext/html/FormTestCase.java
@@ -36,6 +36,7 @@
 import java.io.IOException;
 
 import org.restlet.data.CharacterSet;
+import org.restlet.data.MediaType;
 import org.restlet.ext.html.FormData;
 import org.restlet.ext.html.FormDataSet;
 import org.restlet.ext.html.internal.FormReader;
@@ -67,4 +68,33 @@ public void testParsing() throws IOException {
 
         assertEquals(query, newQuery);
     }
+
+    /**
+     * Tests the multipart content-type.
+     */
+    public void testContentType() throws IOException {
+        FormDataSet form = null;
+
+        form = new FormDataSet();
+        form.setMultipart(true);
+        assertTrue(form.getMediaType().equals(MediaType.MULTIPART_FORM_DATA,
+                true));
+
+        form = new FormDataSet("test");
+        assertTrue(form.isMultipart());
+        assertTrue(form.getMediaType().equals(MediaType.MULTIPART_FORM_DATA,
+                true));
+        assertEquals(
+                form.getMediaType().getParameters().getFirstValue("boundary"),
+                "test");
+        form = new FormDataSet();
+
+        form.setMultipartBoundary("test2");
+        assertTrue(form.isMultipart());
+        assertTrue(form.getMediaType().equals(MediaType.MULTIPART_FORM_DATA,
+                true));
+        assertEquals(
+                form.getMediaType().getParameters().getFirstValue("boundary"),
+                "test2");
+    }
 }
