diff options
| author | Jeroen Frijters <jeroen@sumatra.nl> | 2005-09-09 12:12:02 +0000 |
|---|---|---|
| committer | Jeroen Frijters <jeroen@sumatra.nl> | 2005-09-09 12:12:02 +0000 |
| commit | fa21fc5866d20257df0c46e336e256c3bc1ceb69 (patch) | |
| tree | 5e4cac41d0b870fa87acf2060aae7012c6d4178c /vm | |
| parent | 8fd7187f49244d1664af96ab300baa682317d11f (diff) | |
| download | classpath-fa21fc5866d20257df0c46e336e256c3bc1ceb69.tar.gz | |
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.
Diffstat (limited to 'vm')
| -rw-r--r-- | vm/reference/java/io/VMObjectInputStream.java | 10 | ||||
| -rw-r--r-- | vm/reference/java/io/VMObjectStreamClass.java | 11 |
2 files changed, 18 insertions, 3 deletions
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>). |