8265835: Exception in Quantum due to null platformWindow

Reviewed-by: arapte
openjdk · Nov 3, 2022 · 01735b3 · 01735b3
1 parent 748107a
commit 01735b3
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassScene.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassScene.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -335,13 +335,15 @@ public final synchronized boolean getDoPresent() {
 
     protected Color getClearColor() {
         WindowStage windowStage = stage instanceof WindowStage ? (WindowStage)stage : null;
-        if (windowStage != null && windowStage.getPlatformWindow().isTransparentWindow()) {
+        if (windowStage != null && windowStage.getPlatformWindow() != null &&
+                windowStage.getPlatformWindow().isTransparentWindow()) {
             return (Color.TRANSPARENT);
         } else {
             if (fillPaint == null) {
                 return Color.WHITE;
             } else if (fillPaint.isOpaque() ||
-                    (windowStage != null && windowStage.getPlatformWindow().isUnifiedWindow())) {
+                    (windowStage != null && windowStage.getPlatformWindow() != null &&
+                    windowStage.getPlatformWindow().isUnifiedWindow())) {
                 //For bare windows the transparent fill is allowed
                 if (fillPaint.getType() == Paint.Type.COLOR) {
                     return (Color)fillPaint;