Merge pull request #773 from mygreen/improve-urldecoder-peformance

Improved the StrutsUrlDecoder so that charset retrieval is performed only once.
apache · Oct 25, 2023 · b15b83d · b15b83d
2 parents fc5d1ca + faa98d7
commit b15b83d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/src/main/java/org/apache/struts2/url/StrutsUrlDecoder.java b/core/src/main/java/org/apache/struts2/url/StrutsUrlDecoder.java
@@ -27,11 +27,14 @@
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
+import java.util.Collection;
 
 public class StrutsUrlDecoder implements UrlDecoder {
 
     private static final Logger LOG = LogManager.getLogger(StrutsUrlDecoder.class);
 
+    private static final Collection<Charset> AVAILABLE_CHARSETS = Charset.availableCharsets().values();
+
     private String encoding = "UTF-8";
 
     @Inject(value = StrutsConstants.STRUTS_I18N_ENCODING, required = false)
@@ -107,7 +110,7 @@ private byte convertHexDigit(byte b) {
     }
 
     private Charset getCharset(String encoding) throws UnsupportedEncodingException {
-        for (Charset charset : Charset.availableCharsets().values()) {
+        for (Charset charset : AVAILABLE_CHARSETS) {
             if (encoding.equalsIgnoreCase(charset.name())) {
                 return charset;
             }