From 288fefed143b16558107cb130640ff243ac2e380 Mon Sep 17 00:00:00 2001
From: Jennifer Godinez <jgodinez@openjdk.org>
Date: Fri, 26 Jul 2013 15:08:49 -0700
Subject: [PATCH] 8020208: NullPointerException at
 sun.print.Win32PrintService.getMediaPrintables

Reviewed-by: jchen, prr
---
 jdk/src/windows/classes/sun/print/Win32PrintService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/windows/classes/sun/print/Win32PrintService.java b/jdk/src/windows/classes/sun/print/Win32PrintService.java
index 829eaaa3131..c42de1ae7df 100644
--- a/jdk/src/windows/classes/sun/print/Win32PrintService.java
+++ b/jdk/src/windows/classes/sun/print/Win32PrintService.java
@@ -445,7 +445,7 @@ public class Win32PrintService implements PrintService, AttributeUpdater,
 
         initMedia();
 
-        if ((mediaSizeNames == null) && (mediaSizeNames.length == 0)) {
+        if ((mediaSizeNames == null) || (mediaSizeNames.length == 0)) {
             return null;
         }