GERONIMO-5326 Geronimo javamail does not work on non-ASCII platforms
A couple more places that required updating.
git-svn-id: https://svn.apache.org/repos/asf/geronimo/javamail/trunk@947075 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/imap/connection/IMAPResponse.java b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/imap/connection/IMAPResponse.java
index 9fbbb24..20dd5f6 100644
--- a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/imap/connection/IMAPResponse.java
+++ b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/imap/connection/IMAPResponse.java
@@ -16,6 +16,8 @@
*/
package org.apache.geronimo.javamail.store.imap.connection;
+import java.io.UnsupportedEncodingException;
+
import javax.mail.MessagingException;
/**
@@ -60,6 +62,10 @@
* @return The string version of the response.
*/
public String toString() {
+ try {
+ return new String(response, "US-ASCII");
+ } catch (UnsupportedEncodingException e) {
+ }
return new String(response);
}
}
diff --git a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/pop3/connection/POP3Connection.java b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/pop3/connection/POP3Connection.java
index 0721840..5f1d7c9 100644
--- a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/pop3/connection/POP3Connection.java
+++ b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/store/pop3/connection/POP3Connection.java
@@ -307,7 +307,7 @@
// it's more efficient to do this a buffer at a time.
// the MIMEInputReader takes care of the byte-stuffing and
// ".\r\n" input terminator for us.
- OutputStreamWriter outWriter = new OutputStreamWriter(out);
+ OutputStreamWriter outWriter = new OutputStreamWriter(out, Charset.forName("ISO8859-1"));
char buffer[] = new char[500];
try {
int charsRead = -1;
diff --git a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/nntp/NNTPConnection.java b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/nntp/NNTPConnection.java
index 5b2db9c..93525ff 100644
--- a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/nntp/NNTPConnection.java
+++ b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/nntp/NNTPConnection.java
@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.io.OutputStreamWriter;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
@@ -141,7 +142,7 @@
// set the encoding to ensure that an inappropriate native encoding is not picked up.
Charset iso88591 = Charset.forName("ISO8859-1");
reader = new BufferedReader(new InputStreamReader(inputStream, iso88591));
- writer = new PrintWriter(new BufferedOutputStream(outputStream));
+ writer = new PrintWriter(new OutputStreamWriter(new BufferedOutputStream(outputStream), iso88591));
}
