Refactoring

Signed-off-by: aserkes <[email protected]>
eclipse-ee4j · Jan 9, 2021 · b523c01 · b523c01
1 parent 7d4d5d5
commit b523c01
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/media/multipart/src/main/java/org/glassfish/jersey/media/multipart/ContentDisposition.java b/media/multipart/src/main/java/org/glassfish/jersey/media/multipart/ContentDisposition.java
@@ -225,15 +225,17 @@ private String defineFileName() throws ParseException {
                 return fileNameExt;
             }
 
+            final String charset = matcher.group(CHARSET_GROUP_NAME);
             if (matcher.group(CHARSET_GROUP_NAME).equalsIgnoreCase("UTF-8")) {
-                return new StringBuilder(matcher.group(CHARSET_GROUP_NAME))
+                final String language = matcher.group(LANG_GROUP_NAME);
+                return new StringBuilder(charset)
                         .append("'")
-                        .append(matcher.group(LANG_GROUP_NAME) == null ? "" : matcher.group(LANG_GROUP_NAME))
+                        .append(language == null ? "" : language)
                         .append("'")
                         .append(encodeToUriFormat(fileNameValueChars))
                         .toString();
             } else {
-                throw new ParseException(matcher.group(CHARSET_GROUP_NAME) + " charset is not supported", 0);
+                throw new ParseException(charset + " charset is not supported", 0);
             }
         }