6304277: PIT: Adding a TrayIcon closes a SplashScreen on Solaris but not on Win32
Summary: The Window.closeSplashScreen() method now verified the boolean flag isTrayIconWindow, and returns if it is true.
Reviewed-by: son, dcherepanov
--- a/jdk/src/share/classes/java/awt/Window.java Tue Mar 18 14:20:28 2008 +0300
+++ b/jdk/src/share/classes/java/awt/Window.java Tue Mar 18 14:36:14 2008 +0300
@@ -826,7 +826,10 @@
static private final AtomicBoolean
beforeFirstWindowShown = new AtomicBoolean(true);
- static final void closeSplashScreen() {
+ final void closeSplashScreen() {
+ if (isTrayIconWindow) {
+ return;
+ }
if (beforeFirstWindowShown.getAndSet(false)) {
SunToolkit.closeSplashScreen();
}