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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 02184ccd59a230d941e9c7dff75f2688f12cdb17..681e17c4cce7ef9dcdc8ad46fd8842f43af43c66 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2004-07-17  Michael Koch  <konqueror@gmx.de>
 
        * java/security/Security.java: Fixed javadocs all over.

diff --git a/libjava/java/nio/ByteOrder.java b/libjava/java/nio/ByteOrder.java
index ad0b09ec56e34fd8c976310cb207f3e996818bd8..671336af8dce1c11300aa31a1489cbdab9c4ceb4 100644 (file)
--- 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 185de149fd43d9a925df2d89df7b40d8d7b4e804..620ff130d32df8bc0cc64621b854b31ce24a7809 100644 (file)
--- 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;
   }