Fix GLWindow/SWT-GLCanvas: set context synchronized ; Misc Changes

Fix GLWindow/SWT-GLCanvas: set context synchronized
  - GLWindow fix commit a0177c8a1048683e5d43f4712f8f9e37091d4e85.
    Removed explicit recursive surface lock requires
    recursive context locking, otherwise concurrent rendering fails.
    The implicit recursive surface lock within context makeCurrent()
    is applied after the context lock itself.

Misc Changes
  - Fix TestPBufferDeadlockAWT, which was not using the unique profile string reference

1 files changed, 4 insertions, 1 deletions

diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
index bee2b28f9..53043c3cc 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
@@ -151,7 +151,10 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                 if(DEBUG) {
                     System.err.println("EGLDrawableFactory.destroy("+shutdownType+"): "+sr.device.toString());
                 }
-                EGLDisplayUtil.eglTerminate(sr.device.getHandle());
+                final long eglDisplay = sr.device.getHandle();
+                if(EGL.EGL_NO_DISPLAY != eglDisplay) {
+                    EGLDisplayUtil.eglTerminate(eglDisplay);
+                }
             }
             sharedMap.clear();
             sharedMap = null;