Netty: ctx.form() throws NullPointerException fix #1338

Author: jknack

modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java

@@ -533,6 +533,10 @@ private FileUpload register(FileUpload upload) {
   }
 
   private void decodeForm(HttpRequest req, Formdata form) {
+    if (decoder == null) {
+      // empty/bad form
+      return;
+    }
     try {
       while (decoder.hasNext()) {
         HttpData next = (HttpData) decoder.next();

modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowContext.java

@@ -398,15 +398,17 @@ void destroy(Exception cause) {
   }
 
   private void formData(Formdata form, FormData data) {
-    Iterator<String> it = data.iterator();
-    while (it.hasNext()) {
-      String path = it.next();
-      Deque<FormData.FormValue> values = data.get(path);
-      for (FormData.FormValue value : values) {
-        if (value.isFileItem()) {
-          form.put(path, new UtowFileUpload(path, value));
-        } else {
-          form.put(path, value.getValue());
+    if (data != null) {
+      Iterator<String> it = data.iterator();
+      while (it.hasNext()) {
+        String path = it.next();
+        Deque<FormData.FormValue> values = data.get(path);
+        for (FormData.FormValue value : values) {
+          if (value.isFileItem()) {
+            form.put(path, new UtowFileUpload(path, value));
+          } else {
+            form.put(path, value.getValue());
+          }
         }
       }
     }

tests/pom.xml

@@ -175,6 +175,19 @@
           </execution>
         </executions>
       </plugin>
+      <!-- sure-fire -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+          <includes>
+            <include>**/*Test.java</include>
+            <include>**/*Feature.java</include>
+            <include>**/*Issue*.java</include>
+          </includes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

tests/src/test/java/io/jooby/Issue1338.java

@@ -0,0 +1,33 @@
+package io.jooby;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Issue1338 {
+  @Test
+  @DisplayName("Form should not fail when empty")
+  public void issue1338() {
+    new JoobyRunner(app -> {
+      app.post("/1338/form", ctx -> ctx.form().toMap());
+
+      app.post("/1338/multipart", ctx -> ctx.form().toMap());
+
+    }).ready(client -> {
+      client.post("/1338/form", rsp -> {
+        assertEquals("{}", rsp.body().string());
+      });
+      given()
+          .port(client.getPort())
+          .contentType("multipart/form-data;")
+          .when()
+          .post("/1338/multipart")
+          .then()
+          .assertThat()
+          .body(equalTo("{}"));
+    });
+  }
+}