diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-07-17 08:43:43 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-07-17 08:43:43 +0000 |
| commit | 651ba822d019a847b5f503dfe5c173826508b472 (patch) | |
| tree | 5dd81d15e27076edde723587f5c47cb0205de301 /libjava/java | |
| parent | e3fe5b9c998c27c6ae0863c5be1740aac6345216 (diff) | |
| download | gcc-651ba822d019a847b5f503dfe5c173826508b472.zip gcc-651ba822d019a847b5f503dfe5c173826508b472.tar.gz gcc-651ba822d019a847b5f503dfe5c173826508b472.tar.bz2 | |
2004-07-17 Michael Koch <konqueror@gmx.de>
* java/nio/ByteOrder.java
(static): Removed. Not needed.
Thanks to Patrick Reali for noticing.
* java/nio/charset/CharsetDecoder.java
(decode): Fix for classpath bug #9177: Reset state before flipping.
From-SVN: r84856
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/nio/ByteOrder.java | 15 | ||||
| -rw-r--r-- | libjava/java/nio/charset/CharsetDecoder.java | 1 |
2 files changed, 4 insertions, 12 deletions
diff --git a/libjava/java/nio/ByteOrder.java b/libjava/java/nio/ByteOrder.java index ad0b09e..671336a 100644 --- a/libjava/java/nio/ByteOrder.java +++ b/libjava/java/nio/ByteOrder.java @@ -46,22 +46,13 @@ import gnu.classpath.Configuration; */ public final class ByteOrder { - public static final ByteOrder BIG_ENDIAN = new ByteOrder(); + public static final ByteOrder BIG_ENDIAN = new ByteOrder(); public static final ByteOrder LITTLE_ENDIAN = new ByteOrder(); - static - { - // load the shared library needed for native methods. - if (Configuration.INIT_LOAD_LIBRARY) - { - System.loadLibrary ("javanio"); - } - } - /** * Returns the native byte order of the platform currently running. */ - public static ByteOrder nativeOrder () + public static ByteOrder nativeOrder() { return (System.getProperty ("gnu.cpu.endian").equals("big") ? BIG_ENDIAN : LITTLE_ENDIAN); @@ -76,7 +67,7 @@ public final class ByteOrder } // This class can only be instantiated here. - private ByteOrder () + private ByteOrder() { } } diff --git a/libjava/java/nio/charset/CharsetDecoder.java b/libjava/java/nio/charset/CharsetDecoder.java index 185de14..620ff13 100644 --- a/libjava/java/nio/charset/CharsetDecoder.java +++ b/libjava/java/nio/charset/CharsetDecoder.java @@ -129,6 +129,7 @@ public abstract class CharsetDecoder if (cr.isError ()) cr.throwException (); + reset(); out.flip (); return out; } |