diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-02-25 10:10:30 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-02-25 10:10:30 +0100 |
commit | d9240123dc87003e688eb1e702d56b722eb647f7 (patch) | |
tree | f7179bc868e5302b06dd2660935b2c5e3a65a2c9 /jdisc_http_service | |
parent | 6b52a0fd46d7cad248fa87cc67d6e0ffd1ca88cc (diff) |
Update copyright header. Specify charset
Diffstat (limited to 'jdisc_http_service')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java index 7188cc60d75..188fabc4841 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java @@ -1,4 +1,4 @@ -// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.ssl.impl; import com.yahoo.jdisc.http.ConnectorConfig; @@ -11,6 +11,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import java.io.IOException; import java.io.UncheckedIOException; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; import java.security.KeyStore; @@ -85,7 +86,7 @@ public class ConfiguredSslContextFactoryProvider implements SslContextFactoryPro private static String readToString(String filename) { try { - return new String(Files.readAllBytes(Paths.get(filename))); + return Files.readString(Paths.get(filename), StandardCharsets.UTF_8); } catch (IOException e) { throw new UncheckedIOException(e); } |