Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 659A01036A for ; Thu, 17 Apr 2014 22:56:57 +0000 (UTC) Received: (qmail 89709 invoked by uid 500); 17 Apr 2014 22:56:56 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 89653 invoked by uid 500); 17 Apr 2014 22:56:56 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 89643 invoked by uid 99); 17 Apr 2014 22:56:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2014 22:56:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2014 22:56:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 12E0F238896F; Thu, 17 Apr 2014 22:56:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1588386 [2/2] - in /manifoldcf/trunk: connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tes... Date: Thu, 17 Apr 2014 22:56:33 -0000 To: commits@manifoldcf.apache.org From: iorixxx@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140417225635.12E0F238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/Messages.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/Messages.java?rev=1588386&r1=1588385&r2=1588386&view=diff ============================================================================== --- manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/Messages.java (original) +++ manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/Messages.java Thu Apr 17 22:56:31 2014 @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Writer; +import java.nio.charset.StandardCharsets; import java.util.Iterator; import java.util.Locale; import java.util.Map; @@ -249,7 +250,7 @@ public class Messages extends org.apache InputStream is = getResourceAsStream(classInstance,pathName,locale,resourceKey); try { - BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8")); + BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8)); String line; while ((line = br.readLine()) != null) {