# HG changeset patch
# User jgodinez
# Date 1374876529 25200
# Node ID c8e01130fe0470ffd95fa53b420d950d8060ab53
# Parent  b738ae86554837930497d24320b84dd44fab7b41
8020208: NullPointerException at sun.print.Win32PrintService.getMediaPrintables
Reviewed-by: jchen, prr

diff -r b738ae865548 -r c8e01130fe04 jdk/src/windows/classes/sun/print/Win32PrintService.java
--- a/jdk/src/windows/classes/sun/print/Win32PrintService.java	Fri Jul 26 21:18:42 2013 +0400
+++ b/jdk/src/windows/classes/sun/print/Win32PrintService.java	Fri Jul 26 15:08:49 2013 -0700
@@ -445,7 +445,7 @@
 
         initMedia();
 
-        if ((mediaSizeNames == null) && (mediaSizeNames.length == 0)) {
+        if ((mediaSizeNames == null) || (mediaSizeNames.length == 0)) {
             return null;
         }