Merge pull request #1971 from SAP/pr-jdk-17.0.16+4

Merge to tag jdk-17.0.16+4

Author: RealCLanger

make/modules/java.desktop/lib/Awt2dLibraries.gmk

@@ -299,7 +299,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
         common/awt/debug \
         libawt/java2d, \
     HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
-    DISABLED_WARNINGS_gcc := format-nonliteral type-limits \
+    DISABLED_WARNINGS_gcc := format-nonliteral \
         misleading-indentation undef unused-function stringop-truncation, \
     DISABLED_WARNINGS_clang := tautological-compare format-nonliteral undef, \
     DISABLED_WARNINGS_microsoft := 4819, \

test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java

@@ -155,6 +155,7 @@ private void checkIntrinsics(Operation op, Method m, String latin1, String utf16
                 char cL = latin1.charAt(indexL);
                 char cU = utf16.charAt(indexU);
                 invokeAndCheck(m, cL - cU, latin1, latin1.replace(cL, cU));
+                invokeAndCheck(m, cU - cL, latin1.replace(cL, cU), latin1);
                 invokeAndCheck(m, cU - cL, utf16, utf16.replace(cU, cL));
 
                 // Different lengths

test/jdk/java/awt/Toolkit/Headless/HeadlessToolkit.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,20 @@
  * questions.
  */
 
-import javax.imageio.ImageIO;
-import java.awt.*;
+import java.awt.AWTEvent;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+import java.awt.Image;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
 import java.awt.event.AWTEventListener;
 import java.awt.event.KeyEvent;
@@ -35,16 +47,16 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.URL;
 import java.util.Map;
 
+import javax.imageio.ImageIO;
+
 /*
  * @test
  * @summary Check that Toolkit methods do not throw unexpected exceptions
  *          in headless mode
  * @run main/othervm -Djava.awt.headless=true HeadlessToolkit
  */
-
 public class HeadlessToolkit {
 
     class awtEventListener implements AWTEventListener {
@@ -275,13 +287,12 @@ void doTest() throws IOException {
             im = tk.createImage(image.getAbsolutePath());
             im.flush();
 
-        }
-
-        im = tk.getImage(new URL("https://openjdk.org/images/openjdk.png"));
-        im.flush();
+            im = tk.getImage(image.toURI().toURL());
+            im.flush();
 
-        im = tk.createImage(new URL("https://openjdk.org/images/openjdk.png"));
-        im.flush();
+            im = tk.createImage(image.toURI().toURL());
+            im.flush();
+        }
 
         MemoryImageSource mis;
         int pixels[] = new int[50 * 50];

test/jdk/java/net/InetAddress/IsReachableViaLoopbackTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,22 +21,24 @@
  * questions.
  */
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
 
 /**
  * @test
  * @bug 8135305
  * @key intermittent
+ * @library /test/lib
  * @summary ensure we can't ping external hosts via loopback if
+ * @run main IsReachableViaLoopbackTest
  */
 
 public class IsReachableViaLoopbackTest {
     public static void main(String[] args) {
         try {
-            InetAddress addr = InetAddress.getByName("localhost");
-            InetAddress remoteAddr = InetAddress.getByName("bugs.openjdk.org");
+            InetAddress addr = InetAddress.getLoopbackAddress();
+            InetAddress remoteAddr = InetAddress.getByName("23.197.138.208");  // use literal address to avoid DNS checks
             if (!addr.isReachable(10000))
                 throw new RuntimeException("Localhost should always be reachable");
             NetworkInterface inf = NetworkInterface.getByInetAddress(addr);
@@ -54,7 +56,6 @@ public static void main(String[] args) {
             } else {
                 System.out.println("inf == null");
             }
-
         } catch (IOException e) {
             throw new RuntimeException("Unexpected exception:" + e);
         }

test/jdk/java/net/InetAddress/getOriginalHostName.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,9 @@ public class getOriginalHostName {
     public static void main(String[] args) throws Exception {
         final String HOST = "dummyserver.java.net";
         InetAddress ia = null;
-        ia = InetAddress.getByName(HOST);
+        ia = getInetAddress(HOST);
+        if (ia != null) testInetAddress(ia, HOST);
+        ia = InetAddress.getByAddress(HOST, new byte[] { 1, 2, 3, 4});
         testInetAddress(ia, HOST);
         ia = InetAddress.getByName("255.255.255.0");
         testInetAddress(ia, null);
@@ -53,6 +55,14 @@ public static void main(String[] args) throws Exception {
         testInetAddress(ia, ia.getHostName());
     }
 
+    private static InetAddress getInetAddress(String host) {
+        try {
+            return InetAddress.getByName(host);
+        } catch (java.net.UnknownHostException uhe) {
+            System.out.println("Skipping " + host + " due to " + uhe);
+            return null;
+        }
+    }
 
     private static void testInetAddress(InetAddress ia, String expected)
         throws Exception {

test/jdk/javax/swing/JFrame/bug4614881.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4614881
+ * @summary Ensure that client decorated frames can be brought to the front
+ *          via mouse click on the title pane.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4614881
+ */
+
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+
+public class bug4614881 {
+
+    private static final String INSTRUCTIONS = """
+        Select a native window so that it obscures the client decorated frame.
+        Select the decorated frame by clicking on the title pane.
+        If the decorated frame is brought to the front, then test passes else fails.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4614881 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug4614881::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        Toolkit.getDefaultToolkit().setDynamicLayout(true);
+        JFrame.setDefaultLookAndFeelDecorated(true);
+        JDialog.setDefaultLookAndFeelDecorated(true);
+        final JFrame frame = new JFrame("4614881 - Decorated Frame");
+        frame.setSize(600, 400);
+        frame.setResizable(false);
+        frame.getContentPane().setLayout(new FlowLayout());
+        return frame;
+    }
+}

test/jdk/javax/swing/JInternalFrame/bug4131008.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4131008
+ * @summary JInternalFrame should refresh title after it changing
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4131008
+*/
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.UIManager;
+
+public class bug4131008 {
+
+    private static final String INSTRUCTIONS = """
+        Press button "Change title" at the internal frame "Old".
+        If title of this frame will replaced by "New",
+        then test passed, else test fails.""";
+
+    public static void main(String[] args) throws Exception {
+
+        UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
+
+        PassFailJFrame.builder()
+            .title("bug4131008 Instructions")
+            .instructions(INSTRUCTIONS)
+            .columns(50)
+            .testUI(bug4131008::createTestUI)
+            .build()
+            .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4131008");
+        JInternalFrame jif = new JInternalFrame("Old");
+        JDesktopPane jdp = new JDesktopPane();
+        frame.setContentPane(jdp);
+
+        jif.setSize(150, 100);
+        jif.setVisible(true);
+        JButton bt = new JButton("Change title");
+        bt.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                jif.setTitle("New");
+            }
+        });
+        jif.getContentPane().add(bt);
+        jdp.add(jif);
+        try {
+            jif.setSelected(true);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        frame.setSize(300, 200);
+        return frame;
+    }
+}

test/jdk/javax/swing/JInternalFrame/bug4176136.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4176136
+ * @summary Default close operation JInternalFrame.DO_NOTHING_ON_CLOSE works correctly
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4176136
+ */
+
+
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+
+public class bug4176136 {
+
+    private static final String INSTRUCTIONS = """
+        Click the close button of the internal frame.
+        You will see the close button activate,
+             but nothing else should happen.
+        If the internal frame closes, the test fails.
+        If it doesn't close, the test passes.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4176136 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(25)
+                .testUI(bug4176136::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4176136");
+        JDesktopPane dp = new JDesktopPane();
+        frame.add(dp);
+        JInternalFrame inf = new JInternalFrame();
+        dp.add(inf);
+        inf.setDefaultCloseOperation(JInternalFrame.DO_NOTHING_ON_CLOSE);
+        inf.setSize(100, 100);
+        inf.setClosable(true);
+        inf.setVisible(true);
+        frame.setSize(200, 200);
+        return frame;
+    }
+}