Merge branch 'upstream-master'

Author: Datadog Syncup Service

test/jdk/com/sun/tools/attach/Agent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -28,6 +28,7 @@
  * the given port.
  */
 import java.net.Socket;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.io.IOException;
 
@@ -38,7 +39,7 @@ public static void agentmain(String args) throws IOException {
         int port = Integer.parseInt(args);
         System.out.println("Agent connecting back to Tool....");
         Socket s = new Socket();
-        s.connect( new InetSocketAddress(port) );
+        s.connect(new InetSocketAddress(InetAddress.getLoopbackAddress(), port));
         System.out.println("Agent connected to Tool.");
         s.close();
     }

test/jdk/com/sun/tools/attach/BasicTests.java

@@ -23,6 +23,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.List;
@@ -213,7 +215,8 @@ public static void main(String args[]) throws Exception {
 
             System.out.println(" - Test: End-to-end connection with agent");
 
-            ServerSocket ss = new ServerSocket(0);
+            ServerSocket ss = new ServerSocket();
+            ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             int port = ss.getLocalPort();
 
             System.out.println(" - Loading Agent.jar into target VM ...");
@@ -231,7 +234,8 @@ public static void main(String args[]) throws Exception {
 
             System.out.println(" - Test: End-to-end connection with RedefineAgent");
 
-            ServerSocket ss2 = new ServerSocket(0);
+            ServerSocket ss2 = new ServerSocket();
+            ss2.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             int port2 = ss2.getLocalPort();
 
             System.out.println(" - Loading RedefineAgent.jar into target VM ...");

test/jdk/com/sun/tools/attach/RedefineAgent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, 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
@@ -32,6 +32,7 @@
  * 6446941 java.lang.instrument: multiple agent attach fails (first agent chooses capabilities)
  */
 import java.net.Socket;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.io.IOException;
 import java.util.Arrays;
@@ -104,7 +105,7 @@ public static void agentmain(String args, Instrumentation inst) throws Exception
         int port = Integer.parseInt(args);
         System.out.println("RedefineAgent connecting back to Tool....");
         Socket s = new Socket();
-        s.connect( new InetSocketAddress(port) );
+        s.connect(new InetSocketAddress(InetAddress.getLoopbackAddress(), port));
         System.out.println("RedefineAgent connected to Tool.");
 
         testRedefine(inst);

test/jdk/javax/swing/JToolBar/4529206/bug4529206.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, 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
@@ -28,27 +28,34 @@
  * @key headful
  * @bug     4529206
  * @summary JToolBar - setFloating does not work correctly
- * @author  Konstantin Eremin
  * @run     main bug4529206
  */
 
-import javax.swing.*;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Robot;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
 
-public class bug4529206 extends JFrame {
+public class bug4529206 {
     static JFrame frame;
     static JToolBar jToolBar1;
-    public bug4529206() {
-        setDefaultCloseOperation(EXIT_ON_CLOSE);
-        JPanel jPanFrame = (JPanel) this.getContentPane();
+    static JButton jButton1;
+
+    private static void test() {
+        frame = new JFrame();
+        JPanel jPanFrame = (JPanel) frame.getContentPane();
         jPanFrame.setLayout(new BorderLayout());
-        this.setSize(new Dimension(200, 100));
-        this.setLocation(125, 75);
-        this.setTitle("Test Floating Toolbar");
+        frame.setSize(new Dimension(200, 100));
+        frame.setTitle("Test Floating Toolbar");
         jToolBar1 = new JToolBar();
-        JButton jButton1 = new JButton("Float");
+        jButton1 = new JButton("Float");
         jPanFrame.add(jToolBar1, BorderLayout.NORTH);
         JTextField tf = new JTextField("click here");
         jPanFrame.add(tf);
@@ -58,36 +65,54 @@ public void actionPerformed(ActionEvent e) {
                 buttonPressed(e);
             }
         });
-        makeToolbarFloat();
-        setVisible(true);
+
+        frame.setUndecorated(true);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
     }
 
-    private void makeToolbarFloat() {
+    private static void makeToolbarFloat() {
         javax.swing.plaf.basic.BasicToolBarUI ui = (javax.swing.plaf.basic.BasicToolBarUI) jToolBar1.getUI();
         if (!ui.isFloating()) {
             ui.setFloatingLocation(100, 100);
             ui.setFloating(true, jToolBar1.getLocation());
         }
     }
 
-    private void buttonPressed(ActionEvent e) {
+    private static void buttonPressed(ActionEvent e) {
         makeToolbarFloat();
     }
 
     public static void main(String[] args) throws Exception {
-        SwingUtilities.invokeAndWait(new Runnable() {
-            public void run() {
-                frame = new bug4529206();
-            }
-        });
-        Robot robot = new Robot();
-        robot.waitForIdle();
-        SwingUtilities.invokeAndWait(new Runnable() {
-            public void run() {
-                if (frame.isFocused()) {
-                    throw (new RuntimeException("setFloating does not work correctly"));
+        try {
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    test();
                 }
-            }
-        });
+            });
+            Robot robot = new Robot();
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                makeToolbarFloat();
+            });
+
+            robot.waitForIdle();
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    if (frame.isFocused()) {
+                        throw
+                          new RuntimeException("setFloating does not work correctly");
+                    }
+                }
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
     }
 }