diff options
| author | Mark Wielaard <mark@klomp.org> | 2004-10-30 23:58:26 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2004-10-30 23:58:26 +0000 |
| commit | 5dc8952e24961b6efa8cdcc16db538e040790437 (patch) | |
| tree | 6d2453ace947f0188b33b011f22349388c622151 /libjava | |
| parent | 0ef2c525e56d98d88414604c8e234193868a9b92 (diff) | |
| download | gcc-5dc8952e24961b6efa8cdcc16db538e040790437.tar.gz | |
re PR libgcj/18234 (System property java.library.path doesn't get used by System.loadLibrary())
PR libgcj/18234
* java/lang/Runtime.java (static): Call init().
(Runtime): Remove call to init().
(init): Make static.
From-SVN: r89902
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/java/lang/Runtime.java | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 103cc4bfec2..b10c6f4f293 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2004-10-30 Mark Wielaard <mark@klomp.org> + + PR libgcj/18234 + * java/lang/Runtime.java (static): Call init(). + (Runtime): Remove call to init(). + (init): Make static. + 2004-10-28 David Daney <ddaney@avtrex.com> * gnu/gcj/convert/Output_UnicodeLittleUnmarked.java: New file. diff --git a/libjava/java/lang/Runtime.java b/libjava/java/lang/Runtime.java index a1babfc1817..aaeb93eda2d 100644 --- a/libjava/java/lang/Runtime.java +++ b/libjava/java/lang/Runtime.java @@ -111,6 +111,7 @@ public class Runtime static { + init(); insertSystemProperties(defaultProperties); } @@ -151,7 +152,6 @@ public class Runtime // work. libpath = new String[0]; - init (); } /** @@ -709,10 +709,10 @@ public class Runtime native boolean loadLibraryInternal(String libname); /** - * A helper for the constructor which does some internal native + * A helper for Runtime static initializer which does some internal native * initialization. */ - private native void init (); + private static native void init (); /** * Map a system-independent "short name" to the full file name, and append |