src/share/classes/sun/awt/image/VolatileSurfaceManager.java

*** 331,345 ****
          if (sdAccel != null) {
              // First, nullify the software surface.  This guards against
              // using a SurfaceData that was created in a different
              // display mode.
              sdBackup = null;
-             sdCurrent = getBackupSurface();
              // Now, invalidate the old hardware-based SurfaceData
              SurfaceData oldData = sdAccel;
              sdAccel = null;
              oldData.invalidate();
          }
          // Update graphicsConfig for the vImg in case it changed due to
          // this display change event
          vImg.updateGraphicsConfig();
      }
--- 331,346 ----
          if (sdAccel != null) {
              // First, nullify the software surface.  This guards against
              // using a SurfaceData that was created in a different
              // display mode.
              sdBackup = null;
              // Now, invalidate the old hardware-based SurfaceData
+             // Note that getBackupSurface may set sdAccel to null so we have to invalidate it before
              SurfaceData oldData = sdAccel;
              sdAccel = null;
              oldData.invalidate();
+             sdCurrent = getBackupSurface();
          }
          // Update graphicsConfig for the vImg in case it changed due to
          // this display change event
          vImg.updateGraphicsConfig();
      }