1 files changed, 8 insertions, 2 deletions
diff --git a/libjava/classpath/vm/reference/java/io/VMObjectInputStream.java b/libjava/classpath/vm/reference/java/io/VMObjectInputStream.java
index 7cd97192e74..93a42b1ca9a 100644
--- a/libjava/classpath/vm/reference/java/io/VMObjectInputStream.java
+++ b/libjava/classpath/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()