mirror of
https://github.com/openjdk/jdk.git
synced 2026-02-14 12:25:21 +00:00
6759726: TrayIcon constructor throws NPE instead of documented IAE
Reviewed-by: art
This commit is contained in:
parent
74d8995747
commit
4d337f68e8
@ -143,6 +143,9 @@ public class TrayIcon {
|
||||
*/
|
||||
public TrayIcon(Image image) {
|
||||
this();
|
||||
if (image == null) {
|
||||
throw new IllegalArgumentException("creating TrayIcon with null Image");
|
||||
}
|
||||
setImage(image);
|
||||
}
|
||||
|
||||
|
||||
53
jdk/test/java/awt/TrayIcon/CtorTest/CtorTest.java
Normal file
53
jdk/test/java/awt/TrayIcon/CtorTest/CtorTest.java
Normal file
@ -0,0 +1,53 @@
|
||||
/*
|
||||
* Copyright (c) 2009 Sun Microsystems, Inc. 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
@test
|
||||
@bug 6759726
|
||||
@summary TrayIcon constructor throws NPE instead of documented IAE
|
||||
@author Dmitry Cherepanov area=awt.tray
|
||||
@run main CtorTest
|
||||
*/
|
||||
|
||||
/**
|
||||
* CtorTest.java
|
||||
*
|
||||
* summary: TrayIcon ctor throws IAE if image is null
|
||||
*/
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
public class CtorTest
|
||||
{
|
||||
public static void main(String []s)
|
||||
{
|
||||
boolean isSupported = SystemTray.isSupported();
|
||||
if (isSupported) {
|
||||
try {
|
||||
TrayIcon tray = new TrayIcon(null);
|
||||
} catch(IllegalArgumentException e) {
|
||||
// ctor should throw IAE
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user