summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2006-12-22 19:59:16 +0000
committerKenneth Russel <[email protected]>2006-12-22 19:59:16 +0000
commit400180902ff4d4e7e7290d7933e4667c264f3a97 (patch)
treea8104b77c19fc7fe05e3972d6b1c325c8aae8e74
parentfc66b55b2669803e14079afb29885bc3a2dabf6a (diff)
Worked around breakage of JOGL with 5.0u10: see Sun bug IDs
6504460 and 6333613 git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1047 232f8b59-042b-4e1e-8c03-345bb8c30851
-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);
}
}
}