summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xCHANGELOG.txt3
-rw-r--r--src/classes/javax/media/opengl/GLCanvas.java3
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1f484cc18..abb6a65f3 100755
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -50,3 +50,6 @@ Changes between JOGL 1.0.0 and 1.1.0:
- Windows/AMD64 binaries, including the JOGL Cg binding, are now
supplied.
+
+ - Worked around breakage of JOGL with 5.0u10; see Sun bug IDs 6504460
+ and 6333613.
diff --git a/src/classes/javax/media/opengl/GLCanvas.java b/src/classes/javax/media/opengl/GLCanvas.java
index 3848cca2c..dc25d3844 100644
--- a/src/classes/javax/media/opengl/GLCanvas.java
+++ b/src/classes/javax/media/opengl/GLCanvas.java
@@ -356,7 +356,8 @@ public class GLCanvas extends Canvas implements GLAutoDrawable {
try {
disableBackgroundEraseMethod.invoke(getToolkit(), new Object[] { this });
} catch (Exception e) {
- throw new GLException(e);
+ // FIXME: workaround for 6504460 (incorrect backport of 6333613 in 5.0u10)
+ // throw new GLException(e);
}
}
}