From d22bbd1a01922ed98db276879db908235e9fe036 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Fri, 15 Apr 2016 11:52:23 +0530
Subject: [PATCH] 8154057: [macosx] getPrintJob doesn't throw NPE if Frame is
 null AND type is COMMON

Reviewed-by: prr, jdv
---
 .../macosx/classes/sun/lwawt/LWToolkit.java   |  4 ++
 jdk/test/java/awt/PrintJob/NullFrameTest.java | 48 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 jdk/test/java/awt/PrintJob/NullFrameTest.java

diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
index b7262a5a402..daa02981c27 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
@@ -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();
         }
diff --git a/jdk/test/java/awt/PrintJob/NullFrameTest.java b/jdk/test/java/awt/PrintJob/NullFrameTest.java
new file mode 100644
index 00000000000..a6de7e5b7fc
--- /dev/null
+++ b/jdk/test/java/awt/PrintJob/NullFrameTest.java
@@ -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");
+        }
+    }
+}