diff options
Diffstat (limited to 'src')
6 files changed, 7 insertions, 7 deletions
diff --git a/src/jogl/classes/com/jogamp/graph/geom/SVertex.java b/src/jogl/classes/com/jogamp/graph/geom/SVertex.java index 4846ff5f1..dc6982025 100644 --- a/src/jogl/classes/com/jogamp/graph/geom/SVertex.java +++ b/src/jogl/classes/com/jogamp/graph/geom/SVertex.java @@ -212,7 +212,7 @@ public class SVertex implements Vertex { */ @Override public SVertex clone(){ - return new SVertex(this); + return new SVertex(this); // OK to not call super.clone(), using own copy-ctor } @Override diff --git a/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java b/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java index 078b48ec2..83fceeb2f 100644 --- a/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java +++ b/src/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java @@ -354,7 +354,7 @@ public class GLRendererQuirks { * otherwise false. */ public static boolean areSameStickyDevice(final AbstractGraphicsDevice device1, final AbstractGraphicsDevice device2) { - return device1.getUniqueID() == device2.getUniqueID(); + return device1.getUniqueID() == device2.getUniqueID(); // uses .intern()! } /** diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index 57367adcc..063ad3ef7 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -1082,7 +1082,7 @@ public class GLProfile { if(this==o) { return true; } if(o instanceof GLProfile) { final GLProfile glp = (GLProfile)o; - return getName() == glp.getName() && getImplName() == glp.getImplName() ; + return getName() == glp.getName() && getImplName() == glp.getImplName() ; // uses .intern()! } return false; } diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index 832a797e2..ff4e9314f 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -177,7 +177,7 @@ public abstract class GLContextImpl extends GLContext { glRendererLowerCase = glRenderer; glVersion = glVendor; - if ( null != boundFBOTarget ) { // <init>: boundFBOTarget is not written yet + if ( !isInit && null != boundFBOTarget ) { // <init>: boundFBOTarget is not written yet boundFBOTarget[0] = 0; // draw boundFBOTarget[1] = 0; // read } diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java index b2889fdcf..58542f07d 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java +++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java @@ -476,7 +476,7 @@ public abstract class NativeWindowFactory { */ public static ToolkitLock getDefaultToolkitLock(final String type) { if( requiresToolkitLock ) { - if( TYPE_AWT == type && isAWTAvailable() ) { + if( TYPE_AWT == type && isAWTAvailable() ) { // uses .intern()! return getAWTToolkitLock(); } return ResourceToolkitLock.create(); @@ -494,7 +494,7 @@ public abstract class NativeWindowFactory { */ public static ToolkitLock getDefaultToolkitLock(final String type, final long deviceHandle) { if( requiresToolkitLock ) { - if( TYPE_AWT == type && isAWTAvailable() ) { + if( TYPE_AWT == type && isAWTAvailable() ) { // uses .intern()! return getAWTToolkitLock(); } return ResourceToolkitLock.create(); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock02AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock02AWT.java index 89b2880c2..f69bbd319 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock02AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock02AWT.java @@ -629,7 +629,7 @@ public class TestGLCanvasAWTActionDeadlock02AWT extends UITestCase { } animThread = null; try { - Thread.sleep(20); // ~ 1/60 hz wait, since we can't ctrl stopped threads + Thread.sleep(20); // ~ 1/60 hz wait, since we can't ctrl stopped threads / holding the lock is OK here! } catch (final InterruptedException e) { } return true; } |