diff options
| -rw-r--r-- | libjava/ChangeLog | 3 | ||||
| -rw-r--r-- | libjava/java/lang/String.java | 22 |
2 files changed, 23 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index daba9ef..b2b0354 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,8 @@ 1999-04-21 Tom Tromey <tromey@cygnus.com> + * java/lang/String.java: Don't throw + UnsupportedEncodingException. + * java/lang/natString.cc (getBytes): Correctly size result buffer. From Bryce McKinlay <bryce@albatross.co.nz>. diff --git a/libjava/java/lang/String.java b/libjava/java/lang/String.java index 1321676..55cc9cd 100644 --- a/libjava/java/lang/String.java +++ b/libjava/java/lang/String.java @@ -132,9 +132,27 @@ public final class String public native void getChars (int srcBegin, int srcEnd, char[] dst, int dstBegin); - public byte[] getBytes () throws UnsupportedEncodingException + public byte[] getBytes () { - return getBytes (System.getProperty("file.encoding", "8859_1")); + try + { + return getBytes (System.getProperty("file.encoding", "8859_1")); + } + catch (UnsupportedEncodingException x) + { + // This probably shouldn't happen, but could if file.encoding + // is somehow changed to a value we don't understand. + try + { + return getBytes ("8859_1"); + } + catch (UnsupportedEncodingException x2) + { + // This really shouldn't happen, because the 8859_1 + // encoding should always be available. + throw new InternalError ("couldn't find 8859_1 encoder"); + } + } } public native byte[] getBytes (String enc) |