changeset 6209:93019cb32514

8000486: REGRESSION: Three java2d tests fail since jdk8b58 on Windows 7 with NullPointerException Reviewed-by: flar, art
author bagiras
date Thu, 25 Oct 2012 21:07:31 +0400
parents 84083b5de11e
children 019c69143daf
files src/windows/classes/sun/java2d/ScreenUpdateManager.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/classes/sun/java2d/ScreenUpdateManager.java	Wed Oct 24 18:38:55 2012 +0400
+++ b/src/windows/classes/sun/java2d/ScreenUpdateManager.java	Thu Oct 25 21:07:31 2012 +0400
@@ -111,7 +111,7 @@
                                                    SurfaceData oldsd)
     {
         SurfaceData surfaceData = peer.getSurfaceData();
-        if (surfaceData.isValid()) {
+        if (surfaceData == null || surfaceData.isValid()) {
             return surfaceData;
         }
         peer.replaceSurfaceData();