From f7ca4df7b4e6b2acbdb941f67f6d7058db134d91 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 2 Oct 2012 17:56:20 +0200
Subject: Fix regression of fbe331f013608eb31ff0d8675f4e4c9881c9c48b [Remove
 XInitThreads()]

NativeWindowFactory.getDefaultToolkitLock() is no more a global singleton,
but an instance which has to track/lock a single resource.
Hence the decoration w/ it in GLDrawableFactory is useless and applying lock/unlock
on a new instance also a bug/regression.
---
 src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/jogl/classes')

diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
index 0ea565b89..deb187372 100644
--- a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
@@ -441,24 +441,14 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
 
   @Override
   public GLContext createExternalGLContext() {
-    NativeWindowFactory.getDefaultToolkitLock().lock();
-    try {
-        return createExternalGLContextImpl();
-    } finally {
-        NativeWindowFactory.getDefaultToolkitLock().unlock();
-    }
+    return createExternalGLContextImpl();
   }
 
   protected abstract GLDrawable createExternalGLDrawableImpl();
 
   @Override
   public GLDrawable createExternalGLDrawable() {
-    NativeWindowFactory.getDefaultToolkitLock().lock();
-    try {
-        return createExternalGLDrawableImpl();
-    } finally {
-        NativeWindowFactory.getDefaultToolkitLock().unlock();
-    }
+    return createExternalGLDrawableImpl();
   }
 
 
-- 
cgit v1.2.3