stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8154057: [macosx] getPrintJob doesn't throw NPE if Frame is null AND type is COMMON

Browse Source 
Reviewed-by: prr, jdv
This commit is contained in:
Prasanta Sadhukhan 2016-04-15 11:52:23 +05:30
parent 13ab7793b8
commit d22bbd1a01
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
View File

@ -404,6 +404,10 @@ public abstract class LWToolkit extends SunToolkit implements Runnable {
public final PrintJob getPrintJob(Frame frame, String doctitle,
JobAttributes jobAttributes,
PageAttributes pageAttributes) {
if (frame == null) {
throw new NullPointerException("frame must not be null");
}
if (GraphicsEnvironment.isHeadless()) {
throw new IllegalArgumentException();
}

48
jdk/test/java/awt/PrintJob/NullFrameTest.java Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8154057
* @summary getPrintJob doesn't throw NPE if frame is null
* @run main NullFrameTest
*/
import java.awt.JobAttributes;
import java.awt.Toolkit;
public class NullFrameTest {
public static void main(String[] args) {
JobAttributes ja = new JobAttributes();
ja.setDialog(JobAttributes.DialogType.COMMON);
boolean npeThrown = false;
try {
Toolkit.getDefaultToolkit().getPrintJob(null,
"test Printing", ja, null);
} catch (NullPointerException ex) {
npeThrown = true;
}
if (!npeThrown) {
throw
new RuntimeException("getPrintJob didn't throw NPE for null Frame");
}
}
}