2005-09-09 Jeroen Frijters <jeroen@frijters.net>

        * java/io/ObjectInputStream.java: Removed static initializer.
        * java/io/ObjectOutputStream.java: Removed static initializer.
        * vm/reference/java/io/VMObjectInputStream.java: Added static
        initializer.
        (oisClass, vmoisClass): Removed unused fields.
        * vm/reference/java/io/VMObjectStreamClass.java: Added static
        initializer.

5 files changed, 28 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 8e2f6ebdf..1aa7025ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-09  Jeroen Frijters  <jeroen@frijters.net>
+
+	* java/io/ObjectInputStream.java: Removed static initializer.
+	* java/io/ObjectOutputStream.java: Removed static initializer.
+	* vm/reference/java/io/VMObjectInputStream.java: Added static
+	initializer.
+	(oisClass, vmoisClass): Removed unused fields.
+	* vm/reference/java/io/VMObjectStreamClass.java: Added static
+	initializer.
+
 2005-09-09  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/plaf/basic/BasicLookAndFeel.java
diff --git a/java/io/ObjectInputStream.java b/java/io/ObjectInputStream.java
index e538fc7d9..e268600e8 100644
--- a/java/io/ObjectInputStream.java
+++ b/java/io/ObjectInputStream.java
@@ -39,7 +39,6 @@ exception statement from your version. */
 
 package java.io;
 
-import gnu.classpath.Configuration;
 import gnu.java.io.ObjectIdentityWrapper;
 
 import java.lang.reflect.Array;
@@ -1911,14 +1910,6 @@ public class ObjectInputStream extends InputStream
     System.out.print (Thread.currentThread() + ": ");
   }
 
-  static
-  {
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-	System.loadLibrary ("javaio");
-      }
-  }
-
   // used to keep a prioritized list of object validators
   private static final class ValidatorAndPriority implements Comparable
   {
diff --git a/java/io/ObjectOutputStream.java b/java/io/ObjectOutputStream.java
index 755ef595b..086b13f76 100644
--- a/java/io/ObjectOutputStream.java
+++ b/java/io/ObjectOutputStream.java
@@ -39,7 +39,6 @@ exception statement from your version. */
 
 package java.io;
 
-import gnu.classpath.Configuration;
 import gnu.java.io.ObjectIdentityWrapper;
 import gnu.java.lang.reflect.TypeSignature;
 import gnu.java.security.action.SetAccessibleAction;
@@ -1583,12 +1582,4 @@ public class ObjectOutputStream extends OutputStream
   private boolean dump = false;
 
   private static final boolean DEBUG = false;
-
-  static
-  {
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-        System.loadLibrary("javaio");
-      }
-  }
 }
diff --git a/vm/reference/java/io/VMObjectInputStream.java b/vm/reference/java/io/VMObjectInputStream.java
index 7cd97192e..93a42b1ca 100644
--- a/vm/reference/java/io/VMObjectInputStream.java
+++ b/vm/reference/java/io/VMObjectInputStream.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 
 package java.io;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.VMStackWalker;
 import java.lang.reflect.Constructor;
 import java.security.AccessController;
@@ -46,8 +47,13 @@ import java.security.PrivilegedAction;
 
 final class VMObjectInputStream
 {
-  private static Class oisClass = ObjectInputStream.class;
-  private static Class vmoisClass = VMObjectInputStream.class;
+  static
+  {
+    if (Configuration.INIT_LOAD_LIBRARY)
+      {
+	System.loadLibrary("javaio");
+      }
+  }
 
   // PrivilegedAction needed for Class.getClassLoader()
   private static PrivilegedAction loaderAction = new PrivilegedAction()
diff --git a/vm/reference/java/io/VMObjectStreamClass.java b/vm/reference/java/io/VMObjectStreamClass.java
index 2aee7a9e6..77470fa80 100644
--- a/vm/reference/java/io/VMObjectStreamClass.java
+++ b/vm/reference/java/io/VMObjectStreamClass.java
@@ -1,5 +1,5 @@
 /* VMObjectStreamClass.java -- VM helper functions for ObjectStreamClass
-   Copyright (C) 2003  Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,10 +38,19 @@ exception statement from your version. */
 
 package java.io;
 
+import gnu.classpath.Configuration;
 import java.lang.reflect.Field;
 
 final class VMObjectStreamClass
 {
+  static
+  {
+    if (Configuration.INIT_LOAD_LIBRARY)
+      {
+	System.loadLibrary("javaio");
+      }
+  }
+
   /**
     * Returns true if CLAZZ has a static class initializer
     * (a.k.a. <clinit>).