UnitTest UI: SingletonInstance Lock at @BeforeClass - before all other sub-class calls

1 files changed, 2 insertions, 2 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java b/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java
index 9856616d1..1ff1428fc 100644
--- a/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java
+++ b/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java
@@ -49,7 +49,7 @@ public abstract class UITestCase {
 
     static volatile SingletonInstance singletonInstance;
 
-    private final synchronized void initSingletonInstance() {
+    private static final synchronized void initSingletonInstance() {
         if( null == singletonInstance )  {
             // singletonInstance = SingletonInstance.createFileLock(SINGLE_INSTANCE_LOCK_POLL, SINGLE_INSTANCE_LOCK_FILE);
             singletonInstance = SingletonInstance.createServerSocket(SINGLE_INSTANCE_LOCK_POLL, SINGLE_INSTANCE_LOCK_PORT);
@@ -74,6 +74,7 @@ public abstract class UITestCase {
     @BeforeClass
     public static void oneTimeSetUp() {
         // one-time initialization code                
+        initSingletonInstance();
     }
 
     @AfterClass
@@ -85,7 +86,6 @@ public abstract class UITestCase {
 
     @Before
     public void setUp() {
-        initSingletonInstance();
         System.err.println("++++ UITestCase.setUp: "+getFullTestName());
     }