[kaffe] CVS kaffe (kaz): libraries/javalib/kaffe/io/CharToByteConverter.java,

[Kaffe CVS]

PatchSet 5323 
Date: 2004/10/22 15:38:49
Author: kaz
Branch: HEAD
Tag: (none) 
Log:
2004-10-22  Ito Kazumitsu  <kaz at maczuka.gcd.org>

        * libraries/javalib/kaffe/io/CharToByteConverter.java,
        libraries/javalib/kaffe/io/ByteToCharConverter.java:
        (getConverterInternal) Continue if getByteToCharIconv returns null.

Members: 
	ChangeLog:1.2875->1.2876 
	libraries/javalib/kaffe/io/ByteToCharConverter.java:1.25->1.26 
	libraries/javalib/kaffe/io/CharToByteConverter.java:1.18->1.19 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2875 kaffe/ChangeLog:1.2876
--- kaffe/ChangeLog:1.2875	Thu Oct 21 21:08:45 2004
+++ kaffe/ChangeLog	Fri Oct 22 15:38:49 2004
@@ -1,3 +1,9 @@
+2004-10-22  Ito Kazumitsu  <kaz at maczuka.gcd.org>
+
+	* libraries/javalib/kaffe/io/CharToByteConverter.java,
+	libraries/javalib/kaffe/io/ByteToCharConverter.java:
+	(getConverterInternal) Continue if getByteToCharIconv returns null.
+
 2004-10-21  Dalibor Topic  <robilad at kaffe.org>
 
 	* kaffe/kaffevm/gc.h:
Index: kaffe/libraries/javalib/kaffe/io/ByteToCharConverter.java
diff -u kaffe/libraries/javalib/kaffe/io/ByteToCharConverter.java:1.25 kaffe/libraries/javalib/kaffe/io/ByteToCharConverter.java:1.26
--- kaffe/libraries/javalib/kaffe/io/ByteToCharConverter.java:1.25	Wed Oct  6 22:31:23 2004
+++ kaffe/libraries/javalib/kaffe/io/ByteToCharConverter.java	Fri Oct 22 15:38:56 2004
@@ -117,8 +117,10 @@
 		if (cls == null) {
 			if (ConverterAlias.shouldUseIconv(realenc)) {
 				ByteToCharConverter conv = getByteToCharIconv(ConverterAlias.iconvAlias(realenc));
-				cache.put(enc, (conv != null ? useIconv : noConverter));
-				return (conv);
+				if (conv != null) {
+					cache.put(enc, useIconv);
+					return (conv);
+				}
 			}
 			String enccls = encodingRoot + ".ByteToChar" + realenc;
 			cls = Class.forName(enccls);
Index: kaffe/libraries/javalib/kaffe/io/CharToByteConverter.java
diff -u kaffe/libraries/javalib/kaffe/io/CharToByteConverter.java:1.18 kaffe/libraries/javalib/kaffe/io/CharToByteConverter.java:1.19
--- kaffe/libraries/javalib/kaffe/io/CharToByteConverter.java:1.18	Wed Oct  6 22:31:23 2004
+++ kaffe/libraries/javalib/kaffe/io/CharToByteConverter.java	Fri Oct 22 15:38:56 2004
@@ -94,8 +94,10 @@
 		if (cls == null) {
 			if (ConverterAlias.shouldUseIconv(realenc)) {
 				CharToByteConverter conv = getCharToByteIconv(ConverterAlias.iconvAlias(realenc));
-				cache.put(enc, (conv != null ? useIconv : noConverter));
-				return (conv);
+				if (conv != null) {
+					cache.put(enc, useIconv);
+					return (conv);
+				}
 			}
 			String enccls = encodingRoot + ".CharToByte" + realenc;
 			cls = Class.forName(enccls);