Review comment + OutputRedirect

Author: prsadhuk

modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassScene.java

@@ -250,7 +250,7 @@ final SceneState getSceneState() {
 
     final void updateSceneState() {
         // should only be called on the event thread
-        if (getSceneState() != null) {
+        if (sceneState != null) {
             sceneState.update();
         }
     }

tests/system/src/test/java/test/javafx/embed/swing/JFXPanelNPETest.java

@@ -43,6 +43,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import test.javafx.util.OutputRedirect;
 import test.util.Util;
 
 public class JFXPanelNPETest {
@@ -86,23 +87,19 @@ public void doCleanup() {
 
     @Test
     public void testSceneNPE() throws Exception {
-        failure = new AtomicBoolean(false);
-        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
-            @Override
-            public void uncaughtException(Thread t, Throwable e) {
-                e.printStackTrace();
-                failure.set(true);
+        OutputRedirect.suppressStderr();
+        try {
+            SwingUtilities.invokeAndWait(JFXPanelNPETest::createUI);
+            for (int i = 0; i < 300; i++) {
+                SwingUtilities.invokeLater(contentPane::repaint);
+                Platform.runLater(() -> contentPane.setScene(null));
+                Thread.sleep(1);
+                Platform.runLater(() -> contentPane.setScene(webView.getScene()));
+                Thread.sleep(1);
             }
-        });
-        SwingUtilities.invokeAndWait(JFXPanelNPETest::createUI);
-        for (int i = 0; i < 300; i++) {
-            SwingUtilities.invokeLater(contentPane::repaint);
-            Platform.runLater(() -> contentPane.setScene(null));
-            Thread.sleep(1);
-            Platform.runLater(() -> contentPane.setScene(webView.getScene()));
-            Thread.sleep(1);
+        } finally {
+            OutputRedirect.checkAndRestoreStderr();
         }
-        Assertions.assertFalse(failure.get());
     }
 
     protected static void createUI() {
@@ -122,4 +119,3 @@ private static void fx(final JFXPanel contentPane) {
         contentPane.setScene(new Scene(webView));
     }
 }
-