From 6e7e26ebe734137156e42e601d010987e6d00151 Mon Sep 17 00:00:00 2001
From: amosshi <amosshi@users.noreply.github.com>
Date: Fri, 23 Aug 2024 20:32:51 -0700
Subject: [PATCH] Backport 28b201955907e145f208d756b607ab545a83b2d3

---
 .../stopListening/stoplis001.java             |  7 +++++-
 .../stopListening/stoplis001/TEST.properties  | 24 -------------------
 .../stoplis001/TestDescription.java           |  3 ---
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java
index 340c70a2ad1..8006d1684d0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java
@@ -83,7 +83,6 @@ private int runIt(String argv[], PrintStream out) {
         this.out = out;
         log = new Log(out, argHandler);
 
-        Map<String,? extends com.sun.jdi.connect.Connector.Argument> cArgs1 = initConnector(argHandler.getTransportPort());
         Map<String,? extends com.sun.jdi.connect.Connector.Argument> cArgs2 = initConnector(null);
         if ((addr = startListen(cArgs2)) == null) {
             log.complain("FAILURE: unable to start listening the address " +
@@ -93,6 +92,12 @@ private int runIt(String argv[], PrintStream out) {
         else
             log.display("TEST: start listening the address " + addr);
 
+        // argHandler.getTransportPort() returns a free port (different from the port allocated by startListen(cArgs2))
+        Map<String,? extends com.sun.jdi.connect.Connector.Argument> cArgs1 = initConnector(argHandler.getTransportPort());
+
+        log.display("cArgs1: " + cArgs1);
+        log.display("cArgs2: " + cArgs2);
+
 /* Check that an Exception is thrown if ListeningConnector.stopListening
  has been invoked with argument map different from the one given for
  a previous ListeningConnector.startListening() invocation */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TEST.properties
index 8b51b2a9115..e69de29bb2d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TEST.properties
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TEST.properties
@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2018, 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.
-#
-
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java
index 77da13e38f5..fa68f05d8f5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java
@@ -40,9 +40,6 @@
  *       argument map is the same with the one given for the previous
  *       ListeningConnector.startListening() invocation.
  *
- *     NOTE: this test is tagged "nonconcurrent" because it uses the default
- *     "javadebug" shmem file, as do some other tests.
- *
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdi.ListeningConnector.stopListening.stoplis001