From 8813269b78a456d9a3fc6a4567e5567de2a2d5f3 Mon Sep 17 00:00:00 2001
From: Anthony Petrov <anthony@openjdk.org>
Date: Tue, 18 Mar 2008 14:36:14 +0300
Subject: [PATCH] 6304277: PIT: Adding a TrayIcon closes a SplashScreen on
 Solaris but not on Win32

The Window.closeSplashScreen() method now verified the boolean flag isTrayIconWindow, and returns if it is true.

Reviewed-by: son, dcherepanov
---
 jdk/src/share/classes/java/awt/Window.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/java/awt/Window.java b/jdk/src/share/classes/java/awt/Window.java
index a0841af43e4..3ebeee00639 100644
--- a/jdk/src/share/classes/java/awt/Window.java
+++ b/jdk/src/share/classes/java/awt/Window.java
@@ -826,7 +826,10 @@ public class Window extends Container implements Accessible {
     static private final AtomicBoolean
         beforeFirstWindowShown = new AtomicBoolean(true);
 
-    static final void closeSplashScreen() {
+    final void closeSplashScreen() {
+        if (isTrayIconWindow) {
+            return;
+        }
         if (beforeFirstWindowShown.getAndSet(false)) {
             SunToolkit.closeSplashScreen();
         }