From 16aa730d2573248dd0575def55030481f409c37a Mon Sep 17 00:00:00 2001
From: Alexander Scherbatiy <alexsch@openjdk.org>
Date: Thu, 7 Jul 2016 15:39:19 +0300
Subject: [PATCH] 8160879: [PIT] CloseOnMouseClickPropertyTest fails with AA
 hint:Nonantialiased rendering mode exception

Reviewed-by: ssadetsky, azvegint
---
 .../java.desktop/share/classes/sun/swing/SwingUtilities2.java   | 2 +-
 .../swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java b/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
index 13524ee051a..6f4c5f7045b 100644
--- a/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
+++ b/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
@@ -1093,7 +1093,7 @@ public class SwingUtilities2 {
 
         FontRenderContext frc = cache.get(key);
         if (frc == null) {
-            aaHint = (aaHint == null) ? VALUE_ANTIALIAS_OFF : aaHint;
+            aaHint = (aaHint == null) ? VALUE_TEXT_ANTIALIAS_OFF : aaHint;
             frc = new FontRenderContext(tx, aaHint,
                                         VALUE_FRACTIONALMETRICS_DEFAULT);
             cache.put(key, frc);
diff --git a/jdk/test/javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java b/jdk/test/javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java
index 29949095df5..e9bf230f45e 100644
--- a/jdk/test/javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java
+++ b/jdk/test/javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java
@@ -37,7 +37,7 @@ import javax.swing.UIManager;
 
 /*
  * @test
- * @bug 8158566
+ * @bug 8158566 8160879
  * @summary Provide a Swing property which modifies MenuItemUI behaviour
  */
 public class CloseOnMouseClickPropertyTest {