From d75477b14780e2b1f4b60251ff727a622573ba34 Mon Sep 17 00:00:00 2001
From: Jennifer Godinez <jgodinez@openjdk.org>
Date: Tue, 6 Aug 2013 14:22:48 -0700
Subject: [PATCH] 8021583: test/javax/print/autosense/PrintAutoSenseData.java
 throwing NPE

Reviewed-by: jchen, prr
---
 jdk/src/solaris/classes/sun/print/UnixPrintJob.java           | 4 ++++
 jdk/src/windows/classes/sun/print/Win32PrintJob.java          | 4 ++++
 .../javax/print/attribute/autosense/PrintAutoSenseData.java   | 2 +-
 jdk/test/javax/print/attribute/autosense/sample.txt           | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 jdk/test/javax/print/attribute/autosense/sample.txt

diff --git a/jdk/src/solaris/classes/sun/print/UnixPrintJob.java b/jdk/src/solaris/classes/sun/print/UnixPrintJob.java
index b394884e81e..69ff359cca3 100644
--- a/jdk/src/solaris/classes/sun/print/UnixPrintJob.java
+++ b/jdk/src/solaris/classes/sun/print/UnixPrintJob.java
@@ -334,6 +334,10 @@ public class UnixPrintJob implements CancelablePrintJob {
             throw new PrintException("can't get print data: " + e.toString());
         }
 
+        if (data == null) {
+            throw new PrintException("Null print data.");
+        }
+
         if (flavor == null || (!service.isDocFlavorSupported(flavor))) {
             notifyEvent(PrintJobEvent.JOB_FAILED);
             throw new PrintJobFlavorException("invalid flavor", flavor);
diff --git a/jdk/src/windows/classes/sun/print/Win32PrintJob.java b/jdk/src/windows/classes/sun/print/Win32PrintJob.java
index 2428edf5572..844f3ee4f22 100644
--- a/jdk/src/windows/classes/sun/print/Win32PrintJob.java
+++ b/jdk/src/windows/classes/sun/print/Win32PrintJob.java
@@ -340,6 +340,10 @@ public class Win32PrintJob implements CancelablePrintJob {
             throw new PrintException("can't get print data: " + e.toString());
         }
 
+        if (data == null) {
+            throw new PrintException("Null print data.");
+        }
+
         if (flavor == null || (!service.isDocFlavorSupported(flavor))) {
             notifyEvent(PrintJobEvent.JOB_FAILED);
             throw new PrintJobFlavorException("invalid flavor", flavor);
diff --git a/jdk/test/javax/print/attribute/autosense/PrintAutoSenseData.java b/jdk/test/javax/print/attribute/autosense/PrintAutoSenseData.java
index 307408fe082..214b9ad339b 100644
--- a/jdk/test/javax/print/attribute/autosense/PrintAutoSenseData.java
+++ b/jdk/test/javax/print/attribute/autosense/PrintAutoSenseData.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4468109
+ * @bug 4468109 8021583
  * @summary Test for printing AUTOSENSE DocFlavor.  No exception should be thrown.
  * @run main PrintAutoSenseData
 */
diff --git a/jdk/test/javax/print/attribute/autosense/sample.txt b/jdk/test/javax/print/attribute/autosense/sample.txt
new file mode 100644
index 00000000000..ea84f750953
--- /dev/null
+++ b/jdk/test/javax/print/attribute/autosense/sample.txt
@@ -0,0 +1 @@
+This is a program for testing AutoSense data.