3rd round cdcfp - compile clean.

Re-adding cdcfp:
    com/sun/opengl/impl/glu/mipmap/*
    com/sun/opengl/impl/GLPbufferImpl.java

    Using 'BufferUtil.nativeOrder(ByteBuffer)'
    to set up the native byte order.
    'BufferUtil.nativeOrder' is now public.

    GLDrawableFactory:
        - removed 'hardcoded' awt attribute.

    Cleanup NEWT's AWT wrapping implementation.
        - NativeWindowFactory incooperates with the wrapping property.

    Bugs on X11/NEWT/AWT:
        - no events
        - deadlock at shutdown
        - deadlock if EGLDrawable with AWT get's locked


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

1 files changed, 2 insertions, 8 deletions

diff --git a/src/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java b/src/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
index 1741ba72a..107eba9d2 100644
--- a/src/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
+++ b/src/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
@@ -66,23 +66,17 @@ public class X11OnscreenGLXDrawable extends X11GLXDrawable {
 
   public void swapBuffers() throws GLException {
     getFactory().lockToolkit();
-    try {    
-      boolean didLock = false;
-      
+    try {
       if (component.getSurfaceHandle() == 0) {
         if (lockSurface() == NativeWindow.LOCK_SURFACE_NOT_READY) {
           return;
         }
-
-        didLock = true;
       }
 
       GLX.glXSwapBuffers(component.getDisplayHandle(), component.getSurfaceHandle());
 
-      if (didLock) {
-        unlockSurface();
-      }
     } finally {
+      unlockSurface();
       getFactory().unlockToolkit();
     }
   }