Refactored static initialization to let the JVM ensure it only runs

once; don't remember the JVM static initialization rules which
probably define why it was getting called twice


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1989 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 3 insertions, 9 deletions

diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jvm/JVMUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jvm/JVMUtil.java
index a4bffb100..3faab68bb 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jvm/JVMUtil.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jvm/JVMUtil.java
@@ -50,15 +50,6 @@ public class JVMUtil {
     private static final boolean DEBUG = Debug.debug("JVMUtil");
 
     static {
-        initSingleton();
-    }
-
-    private static volatile boolean isInit = false;
-
-    public static synchronized void initSingleton() {
-        if(isInit) return;
-        isInit=true;
-
         NativeLibLoaderBase.loadNativeWindow("jvm");
 
         ByteBuffer buffer = InternalBufferUtil.newByteBuffer(64);
@@ -71,6 +62,9 @@ public class JVMUtil {
         }
     }
 
+    public static void initSingleton() {
+    }
+
     private JVMUtil() {}
 
     private static native boolean initialize(java.nio.ByteBuffer buffer);