Applying two forbidden api check violations (applied to master).

This commit is contained in:
Dawid Weiss 2019-12-03 14:26:02 +01:00
parent 0d7336db9d
commit 49bab132b1
2 changed files with 4 additions and 3 deletions

View File

@ -33,6 +33,7 @@ import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Locale;
import java.util.Properties; import java.util.Properties;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -395,13 +396,13 @@ public final class HttpServer2 implements FilterContainer {
SSLFactory.SSL_SERVER_NEED_CLIENT_AUTH_DEFAULT); SSLFactory.SSL_SERVER_NEED_CLIENT_AUTH_DEFAULT);
keyStore = sslConf.getTrimmed(SSLFactory.SSL_SERVER_KEYSTORE_LOCATION); keyStore = sslConf.getTrimmed(SSLFactory.SSL_SERVER_KEYSTORE_LOCATION);
if (keyStore == null || keyStore.isEmpty()) { if (keyStore == null || keyStore.isEmpty()) {
throw new IOException(String.format("Property %s not specified", throw new IOException(String.format(Locale.ROOT, "Property %s not specified",
SSLFactory.SSL_SERVER_KEYSTORE_LOCATION)); SSLFactory.SSL_SERVER_KEYSTORE_LOCATION));
} }
keyStorePassword = getPasswordString(sslConf, keyStorePassword = getPasswordString(sslConf,
SSLFactory.SSL_SERVER_KEYSTORE_PASSWORD); SSLFactory.SSL_SERVER_KEYSTORE_PASSWORD);
if (keyStorePassword == null) { if (keyStorePassword == null) {
throw new IOException(String.format("Property %s not specified", throw new IOException(String.format(Locale.ROOT, "Property %s not specified",
SSLFactory.SSL_SERVER_KEYSTORE_PASSWORD)); SSLFactory.SSL_SERVER_KEYSTORE_PASSWORD));
} }
keyStoreType = sslConf.get(SSLFactory.SSL_SERVER_KEYSTORE_TYPE, keyStoreType = sslConf.get(SSLFactory.SSL_SERVER_KEYSTORE_TYPE,

View File

@ -121,7 +121,7 @@ public class CheckLinksAndAnchors { // TODO: rename this class now that it does
public static final class HtmlFileFilter implements FileFilter { public static final class HtmlFileFilter implements FileFilter {
public boolean accept(File pathname) { public boolean accept(File pathname) {
return pathname.getName().toLowerCase().endsWith("html"); return pathname.getName().toLowerCase(Locale.ROOT).endsWith("html");
} }
} }