summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/javax
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-08-29 16:11:08 +0200
committerSven Gothel <[email protected]>2014-08-29 16:11:08 +0200
commitdfb9ed47ac6d8e85f6ae5fe166e7a6e28ca8ff83 (patch)
tree7a5d5ffff61a7eac3e04ff4ee4cb00b4c3437998 /src/jogl/classes/javax
parentad79bd072b600a3f2416cc6f0c61e2925000069d (diff)
Bug 1054: Cleanup GLContext: 'lock' -> 'contextLock'
Diffstat (limited to 'src/jogl/classes/javax')
-rw-r--r--src/jogl/classes/javax/media/opengl/GLContext.java2
1 files changed, 1 insertions, 1 deletions
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<String, Object> attachedObjects = new HashMap<String, Object>();
// 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