TestSWTAccessor03AWTGLn: Fix SWT deadlock on Java7/Windows: Must perform AWT frame close on current thread ..

1 files changed, 6 insertions, 2 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor03AWTGLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor03AWTGLn.java
index 5803a1675..ee5dc7fea 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor03AWTGLn.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor03AWTGLn.java
@@ -120,14 +120,18 @@ public class TestSWTAccessor03AWTGLn extends UITestCase {
         Assert.assertNotNull( shell );
         Assert.assertNotNull( composite );
         Assert.assertNotNull( glcanvas );
-        javax.swing.SwingUtilities.invokeAndWait(new Runnable() {
+        final Runnable releaseAWT = new Runnable() {
             public void run() {
+                // deadlocks Java7 on Windows
                 frame.setVisible(false);
                 frame.remove(glcanvas);
                 frame.dispose();
                 frame = null;
                 glcanvas = null;
-            }});
+            } };
+         // Deadlocks Java7 on Windows
+        // javax.swing.SwingUtilities.invokeAndWait( releaseAWT );
+        releaseAWT.run();
         
         SWTAccessor.invoke(true, new Runnable() {
             public void run() {