changeset 14304:6a1cc5fc1ba0

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