The second "if" should not be needed anymore.

The javadoc suggests that the charset name is not "ISO8851-1" but
"ISO-8851-1" (which is also required to be supported by every
platform)

FWIW, J1.5 has Charset.defaultCharset() which is not applicable for 1.4.

 Bernd

On 4/23/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
Author: norman
Date: Mon Apr 23 05:11:16 2007
New Revision: 531444

URL: http://svn.apache.org/viewvc?view=rev&rev=531444
Log:
Use default charset of ISO8859-1 if charset could not retrived. Thx to GX; -)

Modified:
    james/mime4j/trunk/src/main/java/org/mime4j/util/CharsetUtil.java

Modified: james/mime4j/trunk/src/main/java/org/mime4j/util/CharsetUtil.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/mime4j/util/CharsetUtil.java?view=diff&rev=531444&r1=531443&r2=531444
==============================================================================
--- james/mime4j/trunk/src/main/java/org/mime4j/util/CharsetUtil.java (original)
+++ james/mime4j/trunk/src/main/java/org/mime4j/util/CharsetUtil.java Mon Apr 
23 05:11:16 2007
@@ -1119,10 +1119,11 @@
     }

     public static java.nio.charset.Charset getCharset(String charsetName) {
+        if(charsetName == null) charsetName = "ISO8859-1";
+
         java.nio.charset.Charset c = 
java.nio.charset.Charset.forName(charsetName);

         if (c == null) {
-            //TODO: Check what touse as default
             c = java.nio.charset.Charset.forName("ISO8859-1");

         }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to