[kaffe] CVS kaffe (robilad): resynced with gnu classpath: iconv fix

[Kaffe CVS]

PatchSet 6496 
Date: 2005/05/15 12:46:14
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: iconv fix

2005-05-15  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-04-29  Sven de Marothy  <sven at physto.se>
                    Mark Wielaard  <mark at klomp.org>

        * java/nio/charset/Charset.java (defaultCharset): Use
        SystemProperties.
        (provider): Check gnu.classpath.nio.charset.provider.iconv system
        property and return the IconvProvider when set.

Members: 
	ChangeLog:1.4021->1.4022 
	libraries/javalib/java/nio/charset/Charset.java:1.13->1.14 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4021 kaffe/ChangeLog:1.4022
--- kaffe/ChangeLog:1.4021	Sun May 15 12:31:35 2005
+++ kaffe/ChangeLog	Sun May 15 12:46:14 2005
@@ -2,6 +2,18 @@
 
 	Resynced with GNU Classpath.
 
+	2005-04-29  Sven de Marothy  <sven at physto.se>
+                    Mark Wielaard  <mark at klomp.org>
+
+        * java/nio/charset/Charset.java (defaultCharset): Use
+        SystemProperties.
+        (provider): Check gnu.classpath.nio.charset.provider.iconv system
+        property and return the IconvProvider when set.
+
+2005-05-15  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-04-29  Michael Koch  <konqueror at gmx.de>
 
         * java/nio/charset/Charset.java
Index: kaffe/libraries/javalib/java/nio/charset/Charset.java
diff -u kaffe/libraries/javalib/java/nio/charset/Charset.java:1.13 kaffe/libraries/javalib/java/nio/charset/Charset.java:1.14
--- kaffe/libraries/javalib/java/nio/charset/Charset.java:1.13	Sun May 15 12:31:49 2005
+++ kaffe/libraries/javalib/java/nio/charset/Charset.java	Sun May 15 12:46:20 2005
@@ -38,7 +38,10 @@
 
 package java.nio.charset;
 
+import gnu.classpath.SystemProperties;
+
 import gnu.java.nio.charset.Provider;
+import gnu.java.nio.charset.iconv.IconvProvider;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -129,7 +132,7 @@
     
     try 
       {
-	encoding = System.getProperty("file.encoding");
+	encoding = SystemProperties.getProperty("file.encoding");
       }
     catch(SecurityException e)
       {
@@ -231,6 +234,12 @@
 
   private static CharsetProvider provider()
   {
+    String useIconv = SystemProperties.getProperty
+      ("gnu.classpath.nio.charset.provider.iconv");
+
+    if (useIconv != null)
+      return IconvProvider.provider();
+
     return Provider.provider();
   }