re PR libgcj/18234 (System property java.library.path doesn't get used by System...

       PR libgcj/18234
       * java/lang/Runtime.java (static): Call init().
       (Runtime): Remove call to init().
       (init): Make static.

From-SVN: r89902

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 103cc4bfec2b480506180017977afdcaa4c64f0a..b10c6f4f293af04d54e599dfe3830f68d4bf4797 100644 (file)
--- 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 a1babfc1817ce7d30fcf7df42694e721e453f606..aaeb93eda2dac6675bcf569981d007b118b195de 100644 (file)
--- 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