This is an automated email from the ASF dual-hosted git repository. adoroszlai pushed a commit to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 74d038ef4a0a550b1a1d5c008be223cd12569d98 Author: Doroszlai, Attila <[email protected]> AuthorDate: Fri Jan 12 12:37:20 2018 +0100 AMBARI-22771. Ambari loads ambari.properties using ISO 8859-1 encoding (adoroszlai) --- .../java/org/apache/ambari/server/configuration/Configuration.java | 4 +++- .../org/apache/ambari/server/configuration/ConfigurationTest.java | 5 +++++ ambari-server/src/test/resources/ambari.properties | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java index 2590a83..df5f5a6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java @@ -24,12 +24,14 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.io.Writer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.lang.reflect.Field; +import java.nio.charset.Charset; import java.security.cert.CertificateException; import java.security.interfaces.RSAPublicKey; import java.util.ArrayList; @@ -3198,7 +3200,7 @@ public class Configuration { // load the properties try { - properties.load(inputStream); + properties.load(new InputStreamReader(inputStream, Charset.forName("UTF-8"))); inputStream.close(); } catch (FileNotFoundException fnf) { LOG.info("No configuration file " + CONFIG_FILE + " found in classpath.", fnf); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java index 971c33a..f456094 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java @@ -1074,4 +1074,9 @@ public class ConfigurationTest { Assert.assertEquals(1024, new Configuration(properties).getTlsEphemeralDhKeySize()); } + @Test + public void canReadNonLatin1Properties() { + Assert.assertEquals("árvíztűrő tükörfúrógép", new Configuration().getProperty("encoding.test")); + } + } diff --git a/ambari-server/src/test/resources/ambari.properties b/ambari-server/src/test/resources/ambari.properties index f1b96c7..8ba72e0 100644 --- a/ambari-server/src/test/resources/ambari.properties +++ b/ambari-server/src/test/resources/ambari.properties @@ -14,4 +14,6 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. \ No newline at end of file +# limitations under the License. + +encoding.test=árvíztűrő tükörfúrógép -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
