Merge "Recognize all parts marked with 'multipart/'" into stable-2.14

1 files changed, 3 insertions, 3 deletions

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java
index 3e45e02516..3ba9de762c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java
@@ -156,7 +156,7 @@ public class RawMailParser {
       } else if (part.getMimeType().equals("text/html")) {
         htmlBuilder.append(result);
       }
-    } else if (isMixedOrAlternative(part.getMimeType())) {
+    } else if (isMultipart(part.getMimeType())) {
       Multipart multipart = (Multipart) part.getBody();
       for (Entity e : multipart.getBodyParts()) {
         handleMimePart(e, textBuilder, htmlBuilder);
@@ -168,8 +168,8 @@ public class RawMailParser {
     return (mimeType.equals("text/plain") || mimeType.equals("text/html"));
   }
 
-  private static boolean isMixedOrAlternative(String mimeType) {
-    return mimeType.equals("multipart/alternative") || mimeType.equals("multipart/mixed");
+  private static boolean isMultipart(String mimeType) {
+    return mimeType.startsWith("multipart/");
   }
 
   private static boolean isAttachment(String dispositionType) {