2 files changed, 12 insertions, 0 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index 78ca24be0..fe591c9fc 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -220,6 +220,9 @@ public abstract class GLDrawableFactory {
     }
   }
 
+  protected void enterThreadCriticalZone() {};
+  protected void leaveThreadCriticalZone() {};
+
   protected abstract void shutdownInstance();
 
   /**
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 378d3df9c..3e1727f50 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -1218,6 +1218,15 @@ public class GLProfile {
         if(null == device) {
             return false;
         }
+        GLDrawableFactory factory = GLDrawableFactory.getFactoryImpl(device);
+        factory.enterThreadCriticalZone();
+        try {
+            return initProfilesForDeviceImpl(device);
+        } finally {
+            factory.leaveThreadCriticalZone();
+        }
+    }
+    private static synchronized boolean initProfilesForDeviceImpl(AbstractGraphicsDevice device) {
         boolean isSet = GLContext.getAvailableGLVersionsSet(device);
 
         if(DEBUG) {