From 2163d29813b99a8395ffc4edb6738f450ee3b3a9 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <prasanta.sadhukhan@oracle.com>
Date: Thu, 2 Jan 2025 12:56:19 +0000
Subject: [PATCH] 8346260: Test javax/swing/JOptionPane/bug4174551.java failed
 because the font size of message Hi 24 is not set to 24 in Nimbus LookAndFeel

---
 .../javax/swing/plaf/synth/SynthDefaultLookup.java        | 8 ++++++++
 test/jdk/javax/swing/JOptionPane/bug4174551.java          | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
index ba1927bb948e4..0584a561342e8 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
@@ -25,7 +25,9 @@
 package javax.swing.plaf.synth;
 
 import sun.swing.DefaultLookup;
+
 import javax.swing.JComponent;
+import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 
 /**
@@ -35,6 +37,12 @@
  */
 class SynthDefaultLookup extends DefaultLookup {
     public Object getDefault(JComponent c, ComponentUI ui, String key) {
+        if (ui instanceof SynthOptionPaneUI) {
+            Object value = UIManager.get(key, c.getLocale());
+            if (value != null) {
+                return value;
+            }
+        }
         if (!(ui instanceof SynthUI)) {
             Object value = super.getDefault(c, ui, key);
             return value;
diff --git a/test/jdk/javax/swing/JOptionPane/bug4174551.java b/test/jdk/javax/swing/JOptionPane/bug4174551.java
index f65f95192b7e2..dbe6cdffe1a7d 100644
--- a/test/jdk/javax/swing/JOptionPane/bug4174551.java
+++ b/test/jdk/javax/swing/JOptionPane/bug4174551.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4174551
+ * @bug 4174551 8346260
  * @summary JOptionPane should allow custom buttons
  * @library /java/awt/regtesthelpers
  * @build PassFailJFrame