summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-10-03 00:03:27 +0200
committerSven Gothel <[email protected]>2013-10-03 00:03:27 +0200
commit8234f7a4291de911ce416dcee8c22e12f61a0c3d (patch)
tree61de71453e6e2db0105cfaf2eaabfeb3a02cd269
parent51ea4e5d5d212dfef519cf824d6cbf69e41bebc7 (diff)
GLJPanel: Fix 7u40 access to property 'sun.java2d.opengl'. Property was trusted before ..
-rw-r--r--src/jogl/classes/javax/media/opengl/awt/GLJPanel.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
index 14efbc302..dae631f2a 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
@@ -178,12 +178,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
DEBUG_VIEWPORT = Debug.isPropertyDefined("jogl.debug.GLJPanel.Viewport", true);
USE_GLSL_TEXTURE_RASTERIZER = !Debug.isPropertyDefined("jogl.gljpanel.noglsl", true);
- boolean enabled = false;
- final String sVal = System.getProperty("sun.java2d.opengl");
- if( null != sVal ) {
- enabled = Boolean.valueOf(sVal);
- }
- Debug.initSingleton();
+ boolean enabled = Debug.getBooleanProperty("sun.java2d.opengl", false);
java2dOGLEnabledByProp = enabled && !Debug.isPropertyDefined("jogl.gljpanel.noogl", true);
enabled = false;