commit d50c801e88b43883186a25d8c3f944d74b2e453a
author Nakul Natu <nakul.natu@oracle.com> Wed Oct 21 00:21:57 2015 -0700
committer Abhijit Saha <asaha@openjdk.org> Wed Oct 21 00:21:57 2015 -0700
tree 7f3790ed5d276c6eb09881044118d8a18bf73d1c
parent 34d9c62220c7c29b7b50b6c123e73ad6fa42192e

8132988: Better printing dialogues

Reviewed-by: van, vadim

jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java

diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
index 4530fff..4de4d57 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -234,6 +234,11 @@
         // this will not work if the user clicks on the "Preview" button
         // However if the printer is a StreamPrintService, its the right path.
         PrintService psvc = getPrintService();
+
+        if (psvc == null) {
+            throw new PrinterException("No print service found.");
+        }
+
         if (psvc instanceof StreamPrintService) {
             spoolToService(psvc, attributes);
             return;
@@ -775,4 +780,4 @@
                 (float) (paper.getImageableHeight() / dpi),
                 MediaPrintableArea.INCH);
     }
-}
\ No newline at end of file
+}