Issue 4383 - changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Jan 23, 2020 · c4a3855 · c4a3855
1 parent 059bbfa
commit c4a3855
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java
@@ -60,11 +60,10 @@
  * is done by the parsing thread.
  * </p>
  * <pre>{@code
- *
  * UNPARSED - Parsing has not started, there are no parts which need to be cleaned up.
  * PARSING  - The parsing thread is reading from the InputStream and generating parts.
  * PARSED   - Parsing has complete and no more parts will be generated.
- * ERROR    - deleteParts() has been called while we were in parsing state.
+ * DELETING - deleteParts() has been called while we were in PARSING state, parsing thread will do the delete.
  * DELETED  - The parts have been deleted, this is the terminal state.
  *
  *                              deleteParts()
@@ -86,8 +85,8 @@ private enum State
         UNPARSED,
         PARSING,
         PARSED,
-        DELETED,
-        ERROR
+        DELETING,
+        DELETED
     }
 
     private static final Logger LOG = Log.getLogger(MultiPartFormInputStream.class);
@@ -413,11 +412,11 @@ public void deleteParts()
             switch (state)
             {
                 case DELETED:
-                case ERROR:
+                case DELETING:
                     return;
 
                 case PARSING:
-                    state = State.ERROR;
+                    state = State.DELETING;
                     return;
 
                 case UNPARSED:
@@ -430,10 +429,10 @@ public void deleteParts()
             }
         }
 
-        uncheckedDeleteParts();
+        delete();
     }
 
-    private void uncheckedDeleteParts()
+    private void delete()
     {
         MultiException err = null;
         for (List<Part> parts : _parts.values())
@@ -638,7 +637,7 @@ else if (len == -1)
                         state = State.PARSED;
                         break;
 
-                    case ERROR:
+                    case DELETING:
                         state = State.DELETED;
                         cleanup = true;
                         break;
@@ -649,7 +648,7 @@ else if (len == -1)
             }
 
             if (cleanup)
-                uncheckedDeleteParts();
+                delete();
         }
     }