From dfb9ed47ac6d8e85f6ae5fe166e7a6e28ca8ff83 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 29 Aug 2014 16:11:08 +0200 Subject: Bug 1054: Cleanup GLContext: 'lock' -> 'contextLock' --- src/jogl/classes/javax/media/opengl/GLContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/jogl/classes/javax') diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java index 863eb1a1e..e10579df1 100644 --- a/src/jogl/classes/javax/media/opengl/GLContext.java +++ b/src/jogl/classes/javax/media/opengl/GLContext.java @@ -205,7 +205,7 @@ public abstract class GLContext { private final HashMap attachedObjects = new HashMap(); // RecursiveLock maintains a queue of waiting Threads, ensuring the longest waiting thread will be notified at unlock. - protected final RecursiveLock lock = LockFactory.createRecursiveLock(); + protected final RecursiveLock contextLock = LockFactory.createRecursiveLock(); /** The underlying native OpenGL context */ protected volatile long contextHandle; // volatile: avoid locking for read-only access -- cgit v1.2.3