From c03cdce50e3d7e37c2b129d20062190e39b357db Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Sat, 3 Nov 2018 09:50:22 +0530
Subject: [PATCH] 8213261: test
 javax/swing/plaf/nimbus/AllSwingComponentsBaselineTest.java fails

Reviewed-by: serb
---
 .../swing/plaf/nimbus/AllSwingComponentsBaselineTest.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/jdk/javax/swing/plaf/nimbus/AllSwingComponentsBaselineTest.java b/test/jdk/javax/swing/plaf/nimbus/AllSwingComponentsBaselineTest.java
index b3bc8b621bd..a6a243f0379 100644
--- a/test/jdk/javax/swing/plaf/nimbus/AllSwingComponentsBaselineTest.java
+++ b/test/jdk/javax/swing/plaf/nimbus/AllSwingComponentsBaselineTest.java
@@ -22,7 +22,8 @@
  */
 
 /* @test
-   @bug 8192888
+   @key headful
+   @bug 8192888 8213261
    @summary Verifies getBaseline causes NPE for Nimbus L&F
    @run main AllSwingComponentsBaselineTest
  */
@@ -58,7 +59,9 @@ public class AllSwingComponentsBaselineTest {
             BasicButtonUI bbUI = (BasicButtonUI) UIManager.getUI(b);
             bbUI.getBaseline(b, b.getHeight(), b.getWidth());
         } finally {
-            frame.dispose();
+            if (frame != null) {
+                frame.dispose();
+            }
         }
     }
 }