Merge branch 'development' into FS-222

This commit is contained in:
Ryan 2022-06-03 19:21:07 +01:00 committed by GitHub
commit 8edc87034f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -25,7 +25,7 @@ jobs:
# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
uses: codacy/codacy-analysis-cli-action@4.0.0
uses: codacy/codacy-analysis-cli-action@4.0.2
with:
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
# You can also omit the token and run the tools that support default configurations

View File

@ -337,12 +337,12 @@ public abstract class NanoHTTPD
*/
protected String decodePercent(String str)
{
String decoded = null;
String decoded = str;
try
{
decoded = URLDecoder.decode(str, "UTF8");
}
catch (UnsupportedEncodingException ignored)
catch (UnsupportedEncodingException | IllegalArgumentException ignored)
{
}
return decoded;