Skip to content

use defaultCharset instead of failing on invalid file.encoding #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use defaultCharset instead of failing on invalid file.encoding #778

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
import ch.qos.logback.core.spi.ContextAwareBase;

import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;

Expand Down Expand Up @@ -90,11 +92,16 @@ public boolean changeDetected() {
// SENTINEL);
}

@SuppressWarnings("deprecation")
File convertToFile(URL url) {
String protocol = url.getProtocol();
if ("file".equals(protocol)) {
return new File(URLDecoder.decode(url.getFile()));
try {
return new File(URLDecoder.decode(url.getFile(), Charset.defaultCharset().name()));
} catch (UnsupportedEncodingException e) {
// This can't (?) happen, and if it did, we would not see this message
addInfo("Invalid defaultCharset encoding");
return null;
}
} else {
addInfo("URL [" + url + "] is not of type file");
return null;
Expand Down