From 9ea6ddb8510d174bb66c856867bf0678c83f80ac Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Wed, 4 Feb 2015 10:29:51 -0800
Subject: [PATCH] 8072433: copy/paste duplicated tests in some condition
 statements

Reviewed-by: bae, serb
---
 jdk/src/java.desktop/share/classes/sun/font/FontFamily.java     | 2 +-
 jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontFamily.java b/jdk/src/java.desktop/share/classes/sun/font/FontFamily.java
index b450f86930b..2b67e5122f6 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/FontFamily.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/FontFamily.java
@@ -78,7 +78,7 @@ public class FontFamily {
             family.bolditalic = null;
         }
         if (family.plain == null && family.bold == null &&
-            family.plain == null && family.bold == null) {
+            family.italic == null && family.bolditalic == null) {
             familyNameMap.remove(name);
         }
     }
diff --git a/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java b/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java
index dd99535251f..ece4f48ef97 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java
@@ -1564,7 +1564,7 @@ public class ServiceDialog extends JDialog implements ActionListener {
                 bmObj = bmTmpObj;
             } else {
                 if (lmObj == null || rmObj == null ||
-                    tmObj == null || rmObj == null) {
+                    tmObj == null || bmObj == null) {
                     return;
                 } else {
                     leftMargin.setValue(lmObj);