Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 53021 invoked from network); 21 May 2010 17:51:39 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 May 2010 17:51:39 -0000 Received: (qmail 47821 invoked by uid 500); 21 May 2010 17:51:39 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 47776 invoked by uid 500); 21 May 2010 17:51:39 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 47769 invoked by uid 99); 21 May 2010 17:51:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 May 2010 17:51:38 +0000 X-ASF-Spam-Status: No, hits=-1922.3 required=10.0 tests=ALL_TRUSTED,AWL,HK_RANDOM_ENVFROM,HK_RANDOM_FROM 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; Fri, 21 May 2010 17:51:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6E8FC2388980; Fri, 21 May 2010 17:51:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r947095 - /geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/nntp/newsrc/NNTPNewsrcFile.java Date: Fri, 21 May 2010 17:51:18 -0000 To: scm@geronimo.apache.org From: rickmcguire@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100521175118.6E8FC2388980@eris.apache.org> Author: rickmcguire Date: Fri May 21 17:51:18 2010 New Revision: 947095 URL: http://svn.apache.org/viewvc?rev=947095&view=rev Log: GERONIMO-5326 Geronimo javamail does not work on non-ASCII platforms Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/nntp/newsrc/NNTPNewsrcFile.java Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/nntp/newsrc/NNTPNewsrcFile.java URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/nntp/newsrc/NNTPNewsrcFile.java?rev=947095&r1=947094&r2=947095&view=diff ============================================================================== --- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/nntp/newsrc/NNTPNewsrcFile.java (original) +++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/nntp/newsrc/NNTPNewsrcFile.java Fri May 21 17:51:18 2010 @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.Writer; +import java.nio.charset.Charset; public class NNTPNewsrcFile extends NNTPNewsrc { // source for the file data @@ -50,7 +51,7 @@ public class NNTPNewsrcFile extends NNTP * @exception IOException */ public BufferedReader getInputReader() throws IOException { - return new BufferedReader(new InputStreamReader(new FileInputStream(source))); + return new BufferedReader(new InputStreamReader(new FileInputStream(source), Charset.forName("ISO8859-1"))); } /** @@ -61,6 +62,6 @@ public class NNTPNewsrcFile extends NNTP */ public Writer getOutputWriter() throws IOException { // open this for overwriting - return new OutputStreamWriter(new FileOutputStream(source, false)); + return new OutputStreamWriter(new FileOutputStream(source, false), Charset.forName("ISO8859-1")); } }