PR libgcj/18234

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89902 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 3 insertions, 3 deletions

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