OpenJDK / jdk / jdk
changeset 1730:2482c2865beb
6755274: 6u10b33 2d tests fails on sles10x64 with jvm crash
Reviewed-by: campbell
| author | tdv |
|---|---|
| date | Tue, 21 Oct 2008 08:25:38 -0700 |
| parents | dee3a249a81b |
| children | 830101735cdb |
| files | jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java jdk/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java |
| diffstat | 2 files changed, 16 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java Mon Oct 20 11:52:47 2008 -0700 +++ b/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java Tue Oct 21 08:25:38 2008 -0700 @@ -120,12 +120,14 @@ new GLXGetConfigInfo(device.getScreen(), visualnum); rq.flushAndInvokeNow(action); cfginfo = action.getConfigInfo(); - OGLContext.setScratchSurface(cfginfo); - rq.flushAndInvokeNow(new Runnable() { - public void run() { - ids[0] = OGLContext.getOGLIdString(); - } - }); + if (cfginfo != 0L) { + OGLContext.setScratchSurface(cfginfo); + rq.flushAndInvokeNow(new Runnable() { + public void run() { + ids[0] = OGLContext.getOGLIdString(); + } + }); + } } finally { rq.unlock(); }
--- a/jdk/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java Mon Oct 20 11:52:47 2008 -0700 +++ b/jdk/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java Tue Oct 21 08:25:38 2008 -0700 @@ -127,12 +127,14 @@ new WGLGetConfigInfo(device.getScreen(), pixfmt); rq.flushAndInvokeNow(action); cfginfo = action.getConfigInfo(); - OGLContext.setScratchSurface(cfginfo); - rq.flushAndInvokeNow(new Runnable() { - public void run() { - ids[0] = OGLContext.getOGLIdString(); - } - }); + if (cfginfo != 0L) { + OGLContext.setScratchSurface(cfginfo); + rq.flushAndInvokeNow(new Runnable() { + public void run() { + ids[0] = OGLContext.getOGLIdString(); + } + }); + } } finally { rq.unlock(); }