Update README.md

Handled NAN values with some defaults

README.md

@@ -11,7 +11,7 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
 
 | IDE Version | Latest JBR | Date Released |
 |  ---        | ---        | ---           |
-| 2022.2      | [17.0.4-b469.46](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.4b469.46)| 22-Aug-2022   |
+| 2022.2      | [17.0.4-b469.53](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.4b469.53)| 31-Aug-2022   |
 
 
 ## Contents

jb/project/tools/common/scripts/common.sh

@@ -98,11 +98,18 @@ REPRODUCIBLE_BUILD_OPTS="--enable-reproducible-build
 
 function zip_native_debug_symbols() {
   image_bundle_path=$(echo $1 | cut -d"/" -f-4)
+  jdk_name=$(echo $1 | cut -d"/" -f5)
   jbr_diz_name=$2
 
-  (cd $image_bundle_path && find . -name '*.diz' -exec rsync -R {} ../../../../dizfiles \; )
+  [ -d "dizfiles" ] && rm -rf dizfiles
+  mkdir dizfiles
 
-  (cd dizfiles && find . -print0 | COPYFILE_DISABLE=1 \
+  rsync_target="../../../../dizfiles"
+  [ -z "$jdk_name" ] && rsync_target=$rsync_target"/"$jbr_diz_name
+  (cd $image_bundle_path && find . -name '*.diz' -exec rsync -R {} $rsync_target \;)
+  [ ! -z "$jdk_name" ] && mv dizfiles/$jdk_name dizfiles/$jbr_diz_name
+
+  (cd dizfiles && find $jbr_diz_name -print0 | COPYFILE_DISABLE=1 \
     tar --no-recursion --null -T - -czf ../"$jbr_diz_name".tar.gz) || do_exit $?
 }
 

jb/project/tools/linux/scripts/mkimages_aarch64.sh

@@ -63,7 +63,7 @@ function create_image_bundle {
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-${libc_type_suffix}aarch64-${fastdebug_infix:-}b${build_number%%.*}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix:-}b${build_number}
 
 
   echo Running jlink....

jb/project/tools/linux/scripts/mkimages_x64.sh

@@ -63,7 +63,7 @@ function create_image_bundle {
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-${libc_type_suffix}x64-${fastdebug_infix:-}b${build_number%%.*}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix:-}b${build_number}
 
   echo Running jlink....
   [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
@@ -93,7 +93,7 @@ function create_image_bundle {
   [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
   touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
   gzip "$JBR".tar || do_exit $?
-  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+  #rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
 }
 
 WITH_DEBUG_LEVEL="--with-debug-level=release"

jb/project/tools/linux/scripts/mkimages_x86.sh

@@ -52,7 +52,7 @@ function create_image_bundle {
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-${libc_type_suffix}x86-${fastdebug_infix:-}b${build_number%%.*}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix:-}b${build_number}
 
   echo Running jlink....
   [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"

jb/project/tools/mac/scripts/mkimages.sh

@@ -84,7 +84,7 @@ function create_image_bundle {
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-${architecture}-${fastdebug_infix:-}b${build_number%%.*}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
 
   JRE_CONTENTS=$tmp/$__root_dir/Contents
   mkdir -p "$JRE_CONTENTS" || do_exit $?

jb/project/tools/test/check_jbr_size.sh

@@ -2,20 +2,27 @@
 
 set -euo pipefail
 
+TC_PRINT=0
+# Always print TeamCity service messages if running under TeamCity
+[[ -n "${TEAMCITY_VERSION:-}" ]] && TC_PRINT=1
+
 while getopts ":t" o; do
     case "${o}" in
-        t)
-          t="With Teamcity tests info"
-          TC_PRINT=1
-          ;;
+        t) TC_PRINT=1 ;;
+        *);;
     esac
 done
 shift $((OPTIND-1))
 
-NEWFILEPATH=$1
-CONFIGID=$2
-BUILDID=$3
-TOKEN=$4
+NEWFILEPATH="$1"
+CONFIGID="$2"
+BUILDID="$3"
+TOKEN="$4"
+
+if [ ! -f "$NEWFILEPATH" ]; then
+  echo "File not found: $NEWFILEPATH"
+  exit 1
+fi
 #
 # Get the size of new artifact
 #
@@ -29,11 +36,7 @@ case "${unameOut}" in
       NEWFILESIZE=$(stat -f%z "$NEWFILEPATH")
       ;;
     CYGWIN*)
-      NEWFILESIZE=$(stat -c%s$4
-#
-# Get the size of new artifact
-#
- "$NEWFILEPATH")
+      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
       ;;
     MINGW*)
       NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
@@ -42,13 +45,13 @@ case "${unameOut}" in
       echo "Unknown machine: ${unameOut}"
       exit 1
 esac
-FILENAME=$(basename ${NEWFILEPATH})
+FILENAME=$(basename "${NEWFILEPATH}")
 
 #
 # Get pattern of artifact name
 # Base filename pattern: <BUNDLE_TYPE>-<JDK_VERSION>-<OS>-<ARCH>-b<BUILD>.tar.gz: jbr_dcevm-17.0.2-osx-x64-b1234.tar.gz
 # BUNDLE_TYPE: jbr, jbrsdk, jbr_dcevm, jbrsdk_jcef etc.
-# OS_ARCH_PATTERN - <os_architecture>: osx-x64, linux-aarch64, windows-x64 etc.
+# OS_ARCH_PATTERN - <os_architecture>: osx-x64, linux-aarch64, linux-musl-x64, windows-x64 etc.
 
 BUNDLE_TYPE=jbrsdk
 OS_ARCH_PATTERN=""
@@ -59,33 +62,37 @@ if [[ $FILENAME =~ $re ]]; then
   BUNDLE_TYPE=${BASH_REMATCH[1]}
   OS_ARCH_PATTERN=${BASH_REMATCH[2]}
   FILE_EXTENSION=${BASH_REMATCH[3]}
+else
+  echo "File name $FILENAME does not match regex $re"
+  exit 1
 fi
 
-if [ $TC_PRINT -eq 1 ]; then
-  testname_file_ext=`echo $FILE_EXTENSION | sed 's/\./_/g'`
-  testname=$BUNDLE_TYPE"_"$OS_ARCH_PATTERN$testname_file_ext
-  echo \#\#teamcity[testStarted name=\'$testname\']
-fi
-
-
-echo "BUNDLE_TYPE: "  $BUNDLE_TYPE
-echo "OS_ARCH_PATTERN: " $OS_ARCH_PATTERN
-echo "FILE_EXTENSION: " $FILE_EXTENSION
-echo "New size of $FILENAME = $NEWFILESIZE bytes."
-
+function test_started_msg() {
+  if [ $TC_PRINT -eq 1 ]; then
+    echo "##teamcity[testStarted name='$1']"
+  fi
+}
 
 function test_failed_msg() {
-  if [ $3 -eq 1 ]; then
-    echo \#\#teamcity[testFailed name=\'$1\' message=\'$2\']
+  if [ $TC_PRINT -eq 1 ]; then
+    echo "##teamcity[testFailed name='$1' message='$2']"
   fi
 }
 
 function test_finished_msg() {
-  if [ $2 -eq 1 ]; then
-    echo \#\#teamcity[testFinished name=\'$1\']
+  if [ $TC_PRINT -eq 1 ]; then
+    echo "##teamcity[testFinished name='$1']"
   fi
 }
 
+test_name="${BUNDLE_TYPE}_${OS_ARCH_PATTERN//\-/_}${FILE_EXTENSION//\./_}"
+test_started_msg "$test_name"
+
+echo "BUNDLE_TYPE: $BUNDLE_TYPE"
+echo "OS_ARCH_PATTERN: $OS_ARCH_PATTERN"
+echo "FILE_EXTENSION: $FILE_EXTENSION"
+echo "Size of $FILENAME is $NEWFILESIZE bytes"
+
 #
 # Get previous successful build ID
 # Example:
@@ -95,20 +102,21 @@ function test_finished_msg() {
 # expected return value
 # id="123".number="567"
 #
-CURL_RESPONSE=$(curl --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/?locator=buildType:(id:$CONFIGID),status:success,count:1,finishDate:(build:$BUILDID,condition:before)")
+CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/?locator=buildType:(id:$CONFIGID),status:success,count:1,finishDate:(build:$BUILDID,condition:before)")
 re='id=\"([0-9]+)\".+number=\"([0-9\.]+)\"'
 
 # ID: Previous successful build id
 ID=0
 if [[ $CURL_RESPONSE =~ $re ]]; then
   ID=${BASH_REMATCH[1]}
-  echo "BUILD Number: ${BASH_REMATCH[2]}"
+  echo "Previous build ID: $ID"
+  echo "Previous build number: ${BASH_REMATCH[2]}"
 else
-  msg="ERROR: can't find previous build"
-  echo $msg
-  echo $CURL_RESPONSE
-  test_failed_msg $testname $msg $TC_PRINT
-  test_finished_msg $testname $TC_PRINT
+  msg="ERROR: cannot find previous build"
+  echo "$msg"
+  echo "$CURL_RESPONSE"
+  test_failed_msg "$test_name" "$msg"
+  test_finished_msg "$test_name"
   exit 1
 fi
 
@@ -118,36 +126,37 @@ fi
 # expected return value
 # name="jbrsdk_jcef*.tar.gz size="123'
 #
-CURL_RESPONSE=$(curl --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/$ID?fields=id,number,artifacts(file(name,size))")
-echo "Atrifacts of previous build of $CONFIGID :"
-echo $CURL_RESPONSE
+CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/$ID?fields=id,number,artifacts(file(name,size))")
+echo "Artifacts of the previous build:"
+echo "$CURL_RESPONSE"
 
 # Find binary size (in response) with reg exp
-re='name=\"('$BUNDLE_TYPE'[^\"]+'${OS_ARCH_PATTERN}'[^\"]+'${FILE_EXTENSION}')\" size=\"([0-9]+)\"'
+re="name=\"(${BUNDLE_TYPE}[^\"]+${OS_ARCH_PATTERN}[^\"]+${FILE_EXTENSION})\" size=\"([0-9]+)\""
 
 if [[ $CURL_RESPONSE =~ $re ]]; then
-  OLDFILENAME=${BASH_REMATCH[1]}
-  echo "Prev artifact name: $OLDFILENAME"
-  OLDFILESIZE=${BASH_REMATCH[2]}
-  echo "Prev artifact size = $OLDFILESIZE"
+  prevFileName=${BASH_REMATCH[1]}
+  echo "Previous artifact name: $prevFileName"
+  prevFileSize=${BASH_REMATCH[2]}
+  echo "Previous artifact size: $prevFileSize"
 
-  let allowedSize=OLDFILESIZE+OLDFILESIZE/20 # use 5% threshold
-  echo "Allowed size = $allowedSize"
+  ((allowedSize=prevFileSize+prevFileSize/20)) # use 5% threshold
+  echo "Allowed size: $allowedSize"
   if [[ "$NEWFILESIZE" -gt "$allowedSize" ]]; then
-    msg="ERROR: new size is significally greater than prev size (need to investigate)"
-    echo $msg
-    test_failed_msg $testname $msg $TC_PRINT
-    test_finished_msg $testname $TC_PRINT
+    msg="ERROR: new size is significantly greater than previous size (need to investigate)"
+    echo "$msg"
+    test_failed_msg "$test_name" "$msg"
+    test_finished_msg "$test_name"
     exit 1
   else
     echo "PASSED"
-   test_finished_msg $testname $TC_PRINT
+    test_finished_msg "$test_name"
   fi
 else
-  msg="ERROR: can't find string with size in xml response:"
-  echo $msg
-  echo $CURL_RESPONSE
-  test_failed_msg $testname $msg $TC_PRINT
-  test_finished_msg $testname $TC_PRINT
+  msg="ERROR: cannot find string with size in xml response:"
+  echo "Regex: $re"
+  echo "$msg"
+  echo "$CURL_RESPONSE"
+  test_failed_msg "$test_name" "$msg"
+  test_finished_msg "$test_name"
   exit 1
 fi

jb/project/tools/windows/scripts/mkimages_aarch64.sh

@@ -61,7 +61,7 @@ function create_image_bundle {
   fastdebug_infix=''
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-aarch64-${fastdebug_infix:-}b${build_number%%.*}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
   ${BUILD_JDK}/bin/jlink \

jb/project/tools/windows/scripts/mkimages_x64.sh

@@ -52,7 +52,7 @@ function create_image_bundle {
   fastdebug_infix=''
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-x64-${fastdebug_infix:-}b${build_number%%.*}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
   ${JSDK}/bin/jlink \

jb/project/tools/windows/scripts/mkimages_x86.sh

@@ -47,7 +47,7 @@ function create_image_bundle {
   fastdebug_infix=''
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-x86-${fastdebug_infix:-}b${build_number%%.*}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
   ${JSDK}/bin/jlink \

jb/project/tools/windows/scripts/pack_aarch64.sh

@@ -26,7 +26,7 @@ function pack_jbr {
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-aarch64-${fastdebug_infix:-}b${build_number%%.*}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
 
   echo Creating $JBR.tar.gz ...
   chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir

jb/project/tools/windows/scripts/pack_x64.sh

@@ -26,7 +26,7 @@ function pack_jbr {
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-x64-${fastdebug_infix:-}b${build_number%%.*}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
 
   echo Creating $JBR.tar.gz ...
   chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir

jb/project/tools/windows/scripts/pack_x86.sh

@@ -22,7 +22,7 @@ function pack_jbr {
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-x86-${fastdebug_infix:-}b${build_number%%.*}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
 
   echo Creating $JBR.tar.gz ...
   chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir

src/hotspot/share/code/codeCache.cpp

@@ -630,14 +630,23 @@ bool CodeCache::contains(nmethod *nm) {
   return contains((void *)nm);
 }
 
+static bool is_in_asgct() {
+  Thread* current_thread = Thread::current_or_null_safe();
+  return current_thread != NULL && current_thread->is_Java_thread() && current_thread->as_Java_thread()->in_asgct();
+}
+
 // This method is safe to call without holding the CodeCache_lock, as long as a dead CodeBlob is not
 // looked up (i.e., one that has been marked for deletion). It only depends on the _segmap to contain
 // valid indices, which it will always do, as long as the CodeBlob is not in the process of being recycled.
 CodeBlob* CodeCache::find_blob(void* start) {
   CodeBlob* result = find_blob_unsafe(start);
   // We could potentially look up non_entrant methods
-  guarantee(result == NULL || !result->is_zombie() || result->is_locked_by_vm() || VMError::is_error_reported(), "unsafe access to zombie method");
-  return result;
+  bool is_zombie = result != NULL && result->is_zombie();
+  bool is_result_safe = !is_zombie || result->is_locked_by_vm() || VMError::is_error_reported();
+  guarantee(is_result_safe || is_in_asgct(), "unsafe access to zombie method");
+  // When in ASGCT the previous gurantee will pass for a zombie method but we still don't want that code blob returned in order
+  // to minimize the chance of accessing dead memory
+  return is_result_safe ? result : NULL;
 }
 
 // Lookup that does not fail if you lookup a zombie method (if you call this, be sure to know

src/hotspot/share/prims/forte.cpp

@@ -552,6 +552,9 @@ void AsyncGetCallTrace(ASGCT_CallTrace *trace, jint depth, void* ucontext) {
     return;
   }
 
+  // !important! make sure all to call thread->set_in_asgct(false) before every return
+  thread->set_in_asgct(true);
+
   switch (thread->thread_state()) {
   case _thread_new:
   case _thread_uninitialized:
@@ -609,6 +612,7 @@ void AsyncGetCallTrace(ASGCT_CallTrace *trace, jint depth, void* ucontext) {
     trace->num_frames = ticks_unknown_state; // -7
     break;
   }
+  thread->set_in_asgct(false);
 }
 
 

src/hotspot/share/runtime/thread.cpp

@@ -1014,6 +1014,7 @@ void JavaThread::check_for_valid_safepoint_state() {
 JavaThread::JavaThread() :
   // Initialize fields
 
+  _in_asgct(false),
   _on_thread_list(false),
   DEBUG_ONLY(_java_call_counter(0) COMMA)
   _entry_point(nullptr),

src/hotspot/share/runtime/thread.hpp

@@ -692,6 +692,7 @@ class JavaThread: public Thread {
   friend class ThreadsSMRSupport; // to access _threadObj for exiting_threads_oops_do
   friend class HandshakeState;
  private:
+  bool           _in_asgct;                      // Is set when this JavaThread is handling ASGCT call
   bool           _on_thread_list;                // Is set when this JavaThread is added to the Threads list
   OopHandle      _threadObj;                     // The Java level thread object
 
@@ -1589,6 +1590,10 @@ public:
   static OopStorage* thread_oop_storage();
 
   static void verify_cross_modify_fence_failure(JavaThread *thread) PRODUCT_RETURN;
+
+  // AsyncGetCallTrace support
+  inline bool in_asgct(void) {return _in_asgct;}
+  inline void set_in_asgct(bool value) {_in_asgct = value;}
 };
 
 // Inline implementation of JavaThread::current

src/java.base/share/classes/com/jetbrains/internal/ProxyGenerator.java

@@ -95,7 +95,7 @@ class ProxyGenerator {
         originalBridgeWriter = generateBridge ? new ClassWriter(ClassWriter.COMPUTE_FRAMES) : null;
         if (generateBridge) {
             bridgeWriter = VERIFY_BYTECODE ? new CheckClassAdapter(originalBridgeWriter, true) : originalBridgeWriter;
-        } else bridgeWriter = new ClassVisitor(Opcodes.ASM9) { // Empty visitor
+        } else bridgeWriter = new ClassVisitor(Opcodes.ASM8) { // Empty visitor
             @Override
             public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
                 return new MethodVisitor(api) {};

src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java

@@ -1328,7 +1328,7 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
 
     public Point windowToLocal(Point p, LWWindowPeer wp) {
         LWComponentPeer<?, ?> cp = this;
-        while (cp != wp) {
+        while (cp != null && cp != wp) {
             Rectangle cpb = cp.getBounds();
             p.x -= cpb.x;
             p.y -= cpb.y;

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java

@@ -1218,12 +1218,6 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
      * Callbacks from the AWTWindow and AWTView objc classes.
      *************************************************************/
     private void deliverWindowFocusEvent(boolean gained, CPlatformWindow opposite){
-        // Fix for 7150349: ingore "gained" notifications when the app is inactive.
-        if (gained && !((LWCToolkit)Toolkit.getDefaultToolkit()).isApplicationActive()) {
-            focusLogger.fine("the app is inactive, so the notification is ignored");
-            return;
-        }
-
         LWWindowPeer oppositePeer = (opposite == null)? null : opposite.getPeer();
         responder.handleWindowFocusEvent(gained, oppositePeer);
     }

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m

@@ -37,6 +37,9 @@
 
 #import <Carbon/Carbon.h>
 
+#define DEFAULT_FRAME_WIDTH 1504
+#define DEFAULT_FRAME_HEIGHT 846
+
 // keyboard layout
 static NSString *kbdLayout;
 
@@ -145,6 +148,26 @@ extern bool isSystemShortcut_NextWindowInApplication(NSUInteger modifiersMask, N
     }
 }
 
+- (void)setFrame:(NSRect)newFrame {
+    if (isnan(newFrame.origin.x)) {
+        newFrame.origin.x = 0;
+    }
+
+    if (isnan(newFrame.origin.y)) {
+        newFrame.origin.y = 0;
+    }
+
+    if (isnan(newFrame.size.width)) {
+        newFrame.size.width = DEFAULT_FRAME_WIDTH;
+    }
+
+    if (isnan(newFrame.size.height)) {
+        newFrame.size.height = DEFAULT_FRAME_HEIGHT;
+    }
+
+    [super setFrame:newFrame];
+}
+
 - (BOOL) acceptsFirstMouse: (NSEvent *)event {
     return YES;
 }

src/java.desktop/share/classes/sun/awt/image/VolatileSurfaceManager.java

@@ -66,14 +66,14 @@ public abstract class VolatileSurfaceManager
     /**
      * The accelerated SurfaceData object.
      */
-    protected SurfaceData sdAccel;
+    protected volatile SurfaceData sdAccel;
 
     /**
      * The software-based SurfaceData object.  Only create when first asked
      * to (otherwise it is a waste of memory as it will only be used in
      * situations of surface loss).
      */
-    protected SurfaceData sdBackup;
+    protected volatile SurfaceData sdBackup;
 
     /**
      * The current SurfaceData object.
@@ -342,7 +342,8 @@ public abstract class VolatileSurfaceManager
     public void displayChanged() {
         lostSurface = true;
         boolean needBackup = false;
-        if (sdAccel != null) {
+        SurfaceData oldData = sdAccel;
+        if (oldData != null) {
             // First, nullify the software surface.  This guards against
             // using a SurfaceData that was created in a different
             // display mode.
@@ -352,7 +353,6 @@ public abstract class VolatileSurfaceManager
             }
             // Now, invalidate the old hardware-based SurfaceData
             // Note that getBackupSurface may set sdAccel to null so we have to invalidate it before
-            SurfaceData oldData = sdAccel;
             sdAccel = null;
             oldData.invalidate();
         }

src/java.desktop/share/classes/sun/font/SunFontManager.java

@@ -366,10 +366,10 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
         jreFontMap.put("JetBrainsMono-Thin.ttf", new BundledFontInfo("JetBrainsMono-Thin", 2, 225, 0));
         jreFontMap.put("JetBrainsMono-ThinItalic.ttf", new BundledFontInfo("JetBrainsMono-ThinItalic", 2, 225, 0));
 
-        jreFontMap.put("Inter-SemiBold.otf", new BundledFontInfo("Inter-Bold", 3, 19, 0));
+        jreFontMap.put("Inter-SemiBold.otf", new BundledFontInfo("Inter-SemiBold", 3, 19, 0));
         jreFontMap.put("Inter-Regular.otf", new BundledFontInfo("Inter-Regular", 3, 19, 0));
         jreFontMap.put("Inter-Italic.otf", new BundledFontInfo("Inter-Italic", 3, 19, 0));
-        jreFontMap.put("Inter-SemiBoldItalic.otf", new BundledFontInfo("Inter-BoldItalic", 3, 19, 0));
+        jreFontMap.put("Inter-SemiBoldItalic.otf", new BundledFontInfo("Inter-SemiBoldItalic", 3, 19, 0));
 
         jreBundledFontFiles.addAll(jreFontMap.keySet());
     }

src/java.desktop/share/native/libfontmanager/freetypeScaler.c

@@ -2172,7 +2172,7 @@ static FT_Outline* getFTOutlineNoSetup(FTScalerContext *context, FTScalerInfo* s
     FT_Int32 loadFlags;
 
     // We cannot get an outline from bitmap version of glyph
-    loadFlags = context->loadFlags | FT_LOAD_NO_BITMAP;
+    loadFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
 
     error = FT_Load_Glyph(scalerInfo->face, glyphCode, loadFlags);
     if (error) {

test/hotspot/jtreg/jbProblemList.txt

@@ -38,26 +38,159 @@
 #
 #############################################################################
 
-# jb_jdi
+# :hotspot_compiler
 
-vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java 8065773 generic-all
-vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java 8065773 generic-all
+compiler/ciReplay/TestSAServer.java 8029528 generic-all
+compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8225370 generic-all
+compiler/jvmci/compilerToVM/GetFlagValueTest.java 8204459 generic-all
+compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java 8262901 macosx-aarch64
 
-vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java
-vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java
-vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java
-vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java
-vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java
-vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java
-vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java
-vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java
-vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java
-vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java
-vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java
-vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java
-vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java
-vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java
+compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 8190680 generic-all
 
-vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java
+compiler/runtime/Test8168712.java 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x
+
+compiler/rtm/locking/TestRTMAbortRatio.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMAbortThreshold.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMLockingCalculationDelay.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMLockingThreshold.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMSpinLoopCount.java 8183263 generic-x64
+compiler/rtm/locking/TestUseRTMDeopt.java 8183263 generic-x64
+compiler/rtm/locking/TestUseRTMXendForLockBusy.java 8183263 generic-x64
+compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java 8183263 generic-x64
+
+compiler/c2/Test8004741.java 8235801 generic-all
 
 #############################################################################
+
+# :hotspot_gc
+
+gc/epsilon/TestMemoryMXBeans.java 8206434 generic-all
+gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java 8156755 generic-all
+gc/g1/logging/TestG1LoggingFailure.java 8169634 generic-all
+gc/g1/humongousObjects/TestHeapCounters.java 8178918 generic-all
+gc/stress/gclocker/TestExcessGCLockerCollections.java 8229120 generic-all
+gc/stress/gclocker/TestGCLockerWithParallel.java 8180622 generic-all
+gc/stress/gclocker/TestGCLockerWithG1.java 8180622 generic-all
+gc/stress/TestJNIBlockFullGC/TestJNIBlockFullGC.java 8192647 generic-all
+gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8241293 macosx-x64
+
+#############################################################################
+
+# :hotspot_runtime
+
+runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java 8253437 windows-x64
+runtime/cds/DeterministicDump.java 8253495 generic-all
+runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64
+
+#############################################################################
+
+# :hotspot_serviceability
+
+serviceability/sa/sadebugd/DebugdConnectTest.java 8239062 macosx-x64
+serviceability/sa/TestRevPtrsForInvokeDynamic.java 8241235 generic-all
+
+serviceability/jvmti/ModuleAwareAgents/ThreadStart/MAAThreadStart.java 8225354 windows-all
+
+#############################################################################
+
+# :hotspot_misc
+
+#############################################################################
+
+
+#############################################################################
+
+# :vmTestbase_*
+
+#############################################################################
+
+vmTestbase/nsk/monitoring/MemoryPoolMBean/isCollectionUsageThresholdExceeded/isexceeded003/TestDescription.java 8153598 generic-all
+vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001/TestDescription.java 8198668 generic-all
+vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded002/TestDescription.java 8153598 generic-all
+vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded003/TestDescription.java 8198668 generic-all
+vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded004/TestDescription.java 8153598 generic-all
+vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded005/TestDescription.java 8153598 generic-all
+vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Deadlock/JavaDeadlock001/TestDescription.java 8060733 generic-all
+
+vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java 7034630 generic-all
+
+vmTestbase/metaspace/gc/firstGC_10m/TestDescription.java 8208250 generic-all
+vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java 8208250 generic-all
+vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java 8208250 generic-all
+vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all
+
+vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 generic-all
+vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java 8219652 aix-ppc64
+vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/TestDescription.java 8219652 aix-ppc64
+vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/TestDescription.java 8219652 aix-ppc64
+
+vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8192647 generic-all
+
+vmTestbase/jit/escape/LockCoarsening/LockCoarsening001.java 8148743 generic-all
+vmTestbase/jit/escape/LockCoarsening/LockCoarsening002.java 8208259 generic-all
+
+vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java 8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2none_a/TestDescription.java 8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java 8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java 8013267 generic-all
+
+
+vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java 7199837 generic-all
+
+#############################################################################
+
+vmTestbase/vm/jit/LongTransitions/nativeFnc1/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc10/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc11/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc12/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc13/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc14/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc15/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc16/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc17/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc18/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc19/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc2/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc20/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc21/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc22/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc23/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc24/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc25/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc26/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc27/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc28/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc29/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc3/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc30/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc31/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc32/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc33/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc34/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc35/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc36/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc37/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc38/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc39/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc4/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc40/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc41/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc42/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc43/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc44/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc45/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc46/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc47/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc48/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc49/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc5/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc50/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc51/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc52/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc6/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc7/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc8/TestDescription.java 8271615 macosx-all
+vmTestbase/vm/jit/LongTransitions/nativeFnc9/TestDescription.java 8271615 macosx-all

test/hotspot/jtreg/runtime/7158988/FieldMonitor.java

@@ -143,7 +143,7 @@ public class FieldMonitor {
    * Find a com.sun.jdi.CommandLineLaunch connector
    */
   static LaunchingConnector findLaunchingConnector() {
-    List <Connector> connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+    List <Connector> connectors = Bootstrap.virtualMachineManager().allConnectors();
     Iterator <Connector> iter = connectors.iterator();
     while (iter.hasNext()) {
       Connector connector = iter.next();

test/hotspot/jtreg/serviceability/attach/ShMemLongName.java

@@ -60,7 +60,7 @@ public class ShMemLongName {
             waitForReady(target);
 
             log("attaching to the VM...");
-            AttachingConnector ac = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().attachingConnectors()
+            AttachingConnector ac = Bootstrap.virtualMachineManager().attachingConnectors()
                     .stream()
                     .filter(c -> transport.equals(c.transport().name()))
                     .findFirst()

test/hotspot/jtreg/serviceability/jvmti/8036666/GetObjectLockCount.java

@@ -78,7 +78,7 @@ public class GetObjectLockCount {
      * Find a com.sun.jdi.CommandLineLaunch connector
      */
     static LaunchingConnector findLaunchingConnector() {
-        List <Connector> connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+        List <Connector> connectors = Bootstrap.virtualMachineManager().allConnectors();
         Iterator <Connector> iter = connectors.iterator();
         while (iter.hasNext()) {
             Connector connector = iter.next();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001.java

@@ -52,7 +52,7 @@ public class description001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
         List acl = vmm.allConnectors();
 
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001.java

@@ -76,7 +76,7 @@ public class isvalid001 {
                         "Method tested: " +
                         "jdi.Connector.Argument.isValid\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002.java

@@ -71,7 +71,7 @@ public class isvalid002 {
                         "Method tested: " +
                         "jdi.Connector.Argument.isValid\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003.java

@@ -77,7 +77,7 @@ public class isvalid003 {
                         "Method tested: " +
                         "jdi.Connector.Argument.isValid\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004.java

@@ -78,7 +78,7 @@ public class isvalid004 {
                         "Method tested: " +
                         "jdi.Connector.Argument.isValid\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005.java

@@ -77,7 +77,7 @@ public class isvalid005 {
                         "Method tested: " +
                         "jdi.Connector.Argument.isValid\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001.java

@@ -52,7 +52,7 @@ public class label001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001.java

@@ -73,7 +73,7 @@ public class mustspecify001 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.intValue()\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001.java

@@ -51,7 +51,7 @@ public class name001 {
     public static int run(String argv[],PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001.java

@@ -73,7 +73,7 @@ public class setvalue001 {
                         "Method tested: " +
                         "jdi.Connector.Argument.setValue()\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002.java

@@ -77,7 +77,7 @@ public class setvalue002 {
                         "Method tested: " +
                         "jdi.Connector.Argument.setValue()\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001.java

@@ -51,7 +51,7 @@ public class value001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002.java

@@ -52,7 +52,7 @@ public class value002 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003.java

@@ -61,7 +61,7 @@ public class value003 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         String javaKind = argHandler.getOptions().getProperty("debugee.vmkind");
         boolean java_g = javaKind != null && javaKind.startsWith("java_g"); // ...or java_g.exe

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value004.java

@@ -63,7 +63,7 @@ public class value004 {
     public static int run(String argv[],PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         String address = argHandler.getTransportPort();
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java

@@ -195,7 +195,7 @@ public class attach001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+        List connectors = Bootstrap.virtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java

@@ -192,7 +192,7 @@ public class attach002 extends Log {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+        List connectors = Bootstrap.virtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
         while (iter.hasNext()) {
             Connector connector = (Connector) iter.next();

test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003.java

@@ -70,7 +70,7 @@ public class attach003 {
 
         log = new Log(out, new ArgumentHandler(argv));
 
-        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().attachingConnectors();
+        List connectors = Bootstrap.virtualMachineManager().attachingConnectors();
         log.display("Getting of " + connectors.size() + " connectors.");
         log.display("-----------------------------------------------");
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDriver.java

@@ -28,7 +28,10 @@ import jdk.test.lib.Utils;
 import jtreg.SkippedException;
 import nsk.share.jdi.ArgumentHandler;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -118,7 +121,7 @@ public class TestDriver {
         cmd.add(JDKToolFinder.getJDKTool("java"));
         Collections.addAll(cmd, Utils.prependTestJavaOpts(
                 "-cp",
-                Utils.TEST_CLASS_PATH + File.pathSeparator + System.getenv("CPAPPEND"),
+                Utils.TEST_CLASS_PATH,
                 debuggerClass.getName(),
                 "-debuggeePID",
                 "" + debuggeePid));

test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java

@@ -195,7 +195,7 @@ public class attachnosuspend001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+        List connectors = Bootstrap.virtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001.java

@@ -77,7 +77,7 @@ public class booleanvalue001 {
         String sErr2 =  "ERROR\n" +
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.booleanValue\n" ;
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002.java

@@ -79,7 +79,7 @@ public class booleanvalue002 {
                         "jdi.Connector.BooleanArgument.booleanValue\n" ;
 
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001.java

@@ -77,7 +77,7 @@ public class isvalid001 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.isValue()\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002.java

@@ -71,7 +71,7 @@ public class isvalid002 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001.java

@@ -91,7 +91,7 @@ public class setvalue001 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.setValue\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002.java

@@ -87,7 +87,7 @@ public class setvalue002 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.setValue\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001.java

@@ -76,7 +76,7 @@ public class stringvalueof001 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.stringValueof\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002.java

@@ -76,7 +76,7 @@ public class stringvalueof002 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.stringValueOf\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001.java

@@ -71,7 +71,7 @@ public class bounds001 {
     private int run() {
 
         exitStatus = Consts.TEST_PASSED;
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List attachConnectors;
         List launchConnectors;

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001.java

@@ -51,7 +51,7 @@ public class defaultArguments001 {
     public static int run(String argv[],PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002.java

@@ -52,7 +52,7 @@ public class defaultArguments002 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003.java

@@ -51,7 +51,7 @@ public class defaultArguments003 {
     public static int run(String argv[],PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() < 1) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001.java

@@ -51,7 +51,7 @@ public class description001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001.java

@@ -50,7 +50,7 @@ public class name001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001.java

@@ -75,7 +75,7 @@ public class tostring001 {
         argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {
             display("Number of all known JDI connectors: " + acl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001.java

@@ -51,7 +51,7 @@ public class transport001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001.java

@@ -84,7 +84,7 @@ public class intvalue001 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.intValue()\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002.java

@@ -86,7 +86,7 @@ public class intvalue002 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.intValue()\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001.java

@@ -81,7 +81,7 @@ public class isvalid001 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002.java

@@ -82,7 +82,7 @@ public class isvalid002 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003.java

@@ -82,7 +82,7 @@ public class isvalid003 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001.java

@@ -77,7 +77,7 @@ public class max001 {
                         "jdi.Connector.IntegerArgument.max\n" ;
 
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001.java

@@ -75,7 +75,7 @@ public class min001 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.min\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001.java

@@ -119,7 +119,7 @@ public class setvalue001 {
 
     public static int run(String argv[], PrintStream out) {
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001.java

@@ -82,7 +82,7 @@ public class stringvalueof001 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.intValue()\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001.java

@@ -148,7 +148,7 @@ public class launch001 {
     private LaunchingConnector getLaunchingConnector (
         String connectorName, String transportName) {
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List lcl = vmm.launchingConnectors();
         log.display("Number of attaching connectors: " + lcl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002.java

@@ -148,7 +148,7 @@ public class launch002 {
     private LaunchingConnector getLaunchingConnector (
         String connectorName, String transportName) {
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List lcl = vmm.launchingConnectors();
         log.display("Number of attaching connectors: " + lcl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java

@@ -155,7 +155,7 @@ public class launch003 {
     private LaunchingConnector getLaunchingConnector(
         String connectorName, String transportName) {
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List lcl = vmm.launchingConnectors();
         log.display("Number of launching connectors: " + lcl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java

@@ -154,7 +154,7 @@ public class launch004 {
     private LaunchingConnector getLaunchingConnector(
         String connectorName, String transportName) {
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List lcl = vmm.launchingConnectors();
         log.display("Number of launching connectors: " + lcl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001.java

@@ -167,7 +167,7 @@ public class launchnosuspend001 {
     private LaunchingConnector getLaunchingConnector(
         String connectorName, String transportName) {
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List lcl = vmm.launchingConnectors();
         log.display("Number of launching connectors: " + lcl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java

@@ -197,7 +197,7 @@ public class accept001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+        List connectors = Bootstrap.virtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java

@@ -197,7 +197,7 @@ public class accept002 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+        List connectors = Bootstrap.virtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java

@@ -197,7 +197,7 @@ public class listennosuspend001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+        List connectors = Bootstrap.virtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java

@@ -297,7 +297,7 @@ public class startlis001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+        List connectors = Bootstrap.virtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java

@@ -272,7 +272,7 @@ public class startlis002 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+        List connectors = Bootstrap.virtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java

@@ -202,7 +202,7 @@ public class stoplis001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+        List connectors = Bootstrap.virtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002.java

@@ -202,7 +202,7 @@ public class stoplis002 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
+        List connectors = Bootstrap.virtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001.java

@@ -70,7 +70,7 @@ public class supportsmultipleconnections001 {
                         "jdi.ListeningConnector.supportsMultipleConnections()\n" +
                         "no ListeningConnector supporting multiconnections\n" ;
 
-        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
+ *     Bootstrap.virtualMachineManager() is invoked the pluggable
  *     connector named "PlugAttachConnector001_Name" is created on base
  *     of PlugAttachConnector001 class which implements
  *     com.sun.jdi.connect.AttachingConnector interface.
@@ -83,7 +83,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
+ * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugAttachConnector001_Name" is created on base    <BR>
  * of PlugAttachConnector001 class which implements                    <BR>
  * com.sun.jdi.connect.AttachingConnector interface.                   <BR>
@@ -158,9 +158,9 @@ public class plugAttachConnect001 {
             ("==> Test checks that expected pluggable attaching connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
+ *     Bootstrap.virtualMachineManager() is invoked the pluggable
  *     connector named "PlugAttachConnector002_Name" is created on base
  *     of PlugAttachConnector002 class which implements
  *     com.sun.jdi.connect.AttachingConnector interface.
@@ -93,7 +93,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
+ * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugAttachConnector002_Name" is created on base    <BR>
  * of PlugAttachConnector002 class which implements                    <BR>
  * com.sun.jdi.connect.AttachingConnector interface.                   <BR>
@@ -176,9 +176,9 @@ public class plugAttachConnect002 {
             ("==> Test checks that expected pluggable attaching connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable
+ *     Bootstrap.virtualMachineManager() is invoked a pluggable
  *     connector is NOT created on base of PlugAttachConnector003 class
  *     which implements com.sun.jdi.connect.AttachingConnector interface,
  *     but constructor of PlugAttachConnector003 throws Exception.
@@ -78,7 +78,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable            <BR>
+ * Bootstrap.virtualMachineManager() is invoked a pluggable            <BR>
  * connector is NOT created on base  of PlugAttachConnector003 class   <BR>
  * which implements com.sun.jdi.connect.AttachingConnector interface,  <BR>
  * but constructor of PlugAttachConnector003 throws Exception.         <BR>
@@ -144,17 +144,17 @@ public class plugAttachConnect003 {
 
         VirtualMachineManager virtualMachineManager = null;
         try {
-            virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+            virtualMachineManager = Bootstrap.virtualMachineManager();
         } catch (Throwable thrown) {
-            // OK: com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() may throw an unspecified error
+            // OK: Bootstrap.virtualMachineManager() may throw an unspecified error
             // if initialization of the VirtualMachineManager fails or if the virtual
             // machine manager is unable to locate or create any Connectors.
             logOnVerbose
-                (infoLogPrefixNead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() throws:\n" + thrown);
+                (infoLogPrefixNead + "Bootstrap.virtualMachineManager() throws:\n" + thrown);
             return STATUS_PASSED;
         }
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
+ *     Bootstrap.virtualMachineManager() is invoked the pluggable
  *     connector named "PlugLaunchConnector001_Name" is created on base
  *     of PlugLaunchConnector001 class which implements
  *     com.sun.jdi.connect.LaunchingConnector interface.
@@ -85,7 +85,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
+ * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugLaunchConnector001_Name" is created on base    <BR>
  * of PlugLaunchConnector001 class which implements                    <BR>
  * com.sun.jdi.connect.LaunchingConnector interface.                   <BR>
@@ -160,9 +160,9 @@ public class plugLaunchConnect001 {
             ("==> Test checks that expected pluggable launching connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
+ *     Bootstrap.virtualMachineManager() is invoked the pluggable
  *     connector named "PlugLaunchConnector002_Name" is created on base
  *     of PlugLaunchConnector002 class which implements
  *     com.sun.jdi.connect.LaunchingConnector interface.
@@ -93,7 +93,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
+ * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugLaunchConnector002_Name" is created on base    <BR>
  * of PlugLaunchConnector002 class which implements                    <BR>
  * com.sun.jdi.connect.LaunchingConnector interface.                   <BR>
@@ -176,9 +176,9 @@ public class plugLaunchConnect002 {
             ("==> Test checks that expected pluggable launching connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable
+ *     Bootstrap.virtualMachineManager() is invoked a pluggable
  *     connector is NOT created on base of PlugLaunchConnector003 class
  *     which implements com.sun.jdi.connect.LaunchingConnector interface,
  *     but constructor of PlugLaunchConnector003 throws Exception.
@@ -78,7 +78,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable            <BR>
+ * Bootstrap.virtualMachineManager() is invoked a pluggable            <BR>
  * connector is NOT created on base  of PlugLaunchConnector003 class   <BR>
  * which implements com.sun.jdi.connect.LaunchingConnector interface,  <BR>
  * but constructor of PlugLaunchConnector003 throws Exception.         <BR>
@@ -144,17 +144,17 @@ public class plugLaunchConnect003 {
 
         VirtualMachineManager virtualMachineManager = null;
         try {
-            virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+            virtualMachineManager = Bootstrap.virtualMachineManager();
         } catch (Throwable thrown) {
-            // OK: com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() may throw an unspecified error
+            // OK: Bootstrap.virtualMachineManager() may throw an unspecified error
             // if initialization of the VirtualMachineManager fails or if the virtual
             // machine manager is unable to locate or create any Connectors.
             logOnVerbose
-                (infoLogPrefixNead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() throws:\n" + thrown);
+                (infoLogPrefixNead + "Bootstrap.virtualMachineManager() throws:\n" + thrown);
             return STATUS_PASSED;
         }
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LauWnchingConnector).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
+ *     Bootstrap.virtualMachineManager() is invoked the pluggable
  *     connector named "PlugListenConnector001_Name" is created on base
  *     of PlugListenConnector001 class which implements
  *     com.sun.jdi.connect.ListeningConnector interface.
@@ -85,7 +85,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
+ * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugListenConnector001_Name" is created on base    <BR>
  * of PlugListenConnector001 class which implements                    <BR>
  * com.sun.jdi.connect.ListeningConnector interface.                   <BR>
@@ -160,9 +160,9 @@ public class plugListenConnect001 {
             ("==> Test checks that expected pluggable listening connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
+ *     Bootstrap.virtualMachineManager() is invoked the pluggable
  *     connector named "PlugListenConnector002_Name" is created on base
  *     of PlugListenConnector002 class which implements
  *     com.sun.jdi.connect.ListeningConnector interface.
@@ -93,7 +93,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
+ * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugListenConnector002_Name" is created on base    <BR>
  * of PlugListenConnector002 class which implements                    <BR>
  * com.sun.jdi.connect.ListeningConnector interface.                   <BR>
@@ -176,9 +176,9 @@ public class plugListenConnect002 {
             ("==> Test checks that expected pluggable listening connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable
+ *     Bootstrap.virtualMachineManager() is invoked a pluggable
  *     connector is NOT created on base of PlugListenConnector003 class
  *     which implements com.sun.jdi.connect.ListeningConnector interface,
  *     but constructor of PlugListenConnector003 throws Exception.
@@ -78,7 +78,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable            <BR>
+ * Bootstrap.virtualMachineManager() is invoked a pluggable            <BR>
  * connector is NOT created on base  of PlugListenConnector003 class   <BR>
  * which implements com.sun.jdi.connect.ListeningConnector interface,  <BR>
  * but constructor of PlugListenConnector003 throws Exception.         <BR>
@@ -144,17 +144,17 @@ public class plugListenConnect003 {
 
         VirtualMachineManager virtualMachineManager = null;
         try {
-            virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+            virtualMachineManager = Bootstrap.virtualMachineManager();
         } catch (Throwable thrown) {
-            // OK: com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() may throw an unspecified error
+            // OK: Bootstrap.virtualMachineManager() may throw an unspecified error
             // if initialization of the VirtualMachineManager fails or if the virtual
             // machine manager is unable to locate or create any Connectors.
             logOnVerbose
-                (infoLogPrefixNead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() throws:\n" + thrown);
+                (infoLogPrefixNead + "Bootstrap.virtualMachineManager() throws:\n" + thrown);
             return STATUS_PASSED;
         }
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected
+ *     Bootstrap.virtualMachineManager() is invoked the 6 expected
  *     pluggable connectors are created  properly on base of 6 differen
  *     Connector implementations of different types.
  *     The test expects that 2 pluggable connectors should be
@@ -96,7 +96,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected         <BR>
+ * Bootstrap.virtualMachineManager() is invoked the 6 expected         <BR>
  * pluggable connectors are created  properly on base of 6 different   <BR>
  * Connector implementations of different types.                       <BR>
  *                                                                     <BR>
@@ -201,9 +201,9 @@ public class plugMultiConnect001 {
         referencePlugConnectors[4] = new PlugListenConnector001_01();
         referencePlugConnectors[5] = new PlugListenConnector001_02();
 
-        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected
+ *     Bootstrap.virtualMachineManager() is invoked the 6 expected
  *     pluggable connectors are created  properly on base of 6 different
  *     Connector implementations of different types, but 3 other pluggable
  *     connectors are NOT created for Connector implementations for which
@@ -59,7 +59,7 @@
  *          Connector.BooleanArgument;
  *          Connector.SelectedArgument;
  *     Also the test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 3 pluggable
+ *     Bootstrap.virtualMachineManager() is invoked the 3 pluggable
  *     connectors are NOT created as they are based on classes which
  *     implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, and LaunchingConnector),
@@ -108,7 +108,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected         <BR>
+ * Bootstrap.virtualMachineManager() is invoked the 6 expected         <BR>
  * pluggable connectors are created  properly on base of 6 different   <BR>
  * Connector implementations of different types, but 3 other pluggable <BR>
  * connectors are NOT created for Connector implementations for which  <BR>
@@ -139,7 +139,7 @@ import java.io.*;
  *      Connector.SelectedArgument;                                    <BR>
  *                                                                     <BR>
  * Also the test checks up that at start-up time when                  <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 3 pluggable        <BR>
+ * Bootstrap.virtualMachineManager() is invoked the 3 pluggable        <BR>
  * connectors are NOT created as they are based on classes which       <BR>
  * implement the Connector interfaces                                  <BR>
  * (AttachingConnector, ListeningConnector, and LaunchingConnector),   <BR>
@@ -230,9 +230,9 @@ public class plugMultiConnect002 {
         referencePlugConnectors[4] = new PlugListenConnector002_01();
         referencePlugConnectors[5] = new PlugListenConnector002_02();
 
-        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the TransportService abstract
  *     class (com.sun.jdi.connect.spi.TransportService).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked four expected pluggable
+ *     Bootstrap.virtualMachineManager() is invoked four expected pluggable
  *     connectors (two AttachingConnectors and two ListeningConnectors) are
  *     created  properly on base of two different TransportService
  *     implementations.
@@ -115,7 +115,7 @@ import java.io.*;
  * class (com.sun.jdi.connect.spi.TransportService).                        <BR>
  *                                                                          <BR>
  * The test checks up that at start-up time when                            <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked four expected pluggable     <BR>
+ * Bootstrap.virtualMachineManager() is invoked four expected pluggable     <BR>
  * connectors (two AttachingConnectors and two ListeningConnectors) are     <BR>
  * created  properly on base of two different TransportService              <BR>
  * implementations.                                                         <BR>
@@ -229,9 +229,9 @@ public class plugMultiConnect003 {
         referenceTransportServices[0] = new PlugTransportService003_01();
         referenceTransportServices[1] = new PlugTransportService003_02();
 
-        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the TransportService abstract
  *     class (com.sun.jdi.connect.spi.TransportService).
  *     The test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked four expected pluggable
+ *     Bootstrap.virtualMachineManager() is invoked four expected pluggable
  *     connectors (two AttachingConnectors and two ListeningConnectors) are
  *     created  properly on base of two different TransportService
  *     implementations, but 2 other pluggable connectors (AttachingConnector
@@ -77,7 +77,7 @@
  *          capabilities().supportsHandshakeTimeout = false
  *          capabilities().supportsMultipleConnections = false
  *     Also the test checks up that at start-up time when
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 2 pluggable connectors
+ *     Bootstrap.virtualMachineManager() is invoked the 2 pluggable connectors
  *     (AttachingConnector and ListeningConnector) are NOT created as they are
  *     based on class which extends the TransportService abstract class but
  *     constructors of this class throws Exception.
@@ -124,7 +124,7 @@ import java.io.*;
  * class (com.sun.jdi.connect.spi.TransportService).                        <BR>
  *                                                                          <BR>
  * The test checks up that at start-up time when                            <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked four expected pluggable     <BR>
+ * Bootstrap.virtualMachineManager() is invoked four expected pluggable     <BR>
  * connectors (two AttachingConnectors and two ListeningConnectors) are     <BR>
  * created  properly on base of two different TransportService              <BR>
  * implementations, but 2 other pluggable connectors (AttachingConnector    <BR>
@@ -174,7 +174,7 @@ import java.io.*;
  *      capabilities().supportsMultipleConnections = false                  <BR>
  *                                                                          <BR>
  * Also the test checks up that at start-up time when                       <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 2 pluggable connectors  <BR>
+ * Bootstrap.virtualMachineManager() is invoked the 2 pluggable connectors  <BR>
  * (AttachingConnector and ListeningConnector) are NOT created as they are  <BR>
  * based on class which extends the TransportService abstract class but     <BR>
  * constructors of this class throws Exception.                             <BR>
@@ -258,9 +258,9 @@ public class plugMultiConnect004 {
             = new String[invalidTransportServicesNumber];
         invalidTransportServicesNames[0] = "PlugTransportService004_03_Name";
 
-        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java

@@ -35,7 +35,7 @@
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     and the TransportService abstract class.
  *     The test checks up that at start-up time when >
- *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected
+ *     Bootstrap.virtualMachineManager() is invoked the 6 expected
  *     pluggable connectors are created  properly on base of 6 different
  *     Connector implementations of different types and four expected
  *     pluggable connectors (two AttachingConnectors and two
@@ -126,7 +126,7 @@ import java.io.*;
  * and the TransportService abstract class.                                 <BR>
  *                                                                          <BR>
  * The test checks up that at start-up time when                            <BR>
- * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected              <BR>
+ * Bootstrap.virtualMachineManager() is invoked the 6 expected              <BR>
  * pluggable connectors are created  properly on base of 6 different        <BR>
  * Connector implementations of different types and four expected           <BR>
  * pluggable connectors (two AttachingConnectors and two                    <BR>
@@ -272,9 +272,9 @@ public class plugMultiConnect005 {
         referenceTransportServices[0] = new PlugTransportService005_01();
         referenceTransportServices[1] = new PlugTransportService005_02();
 
-        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
+        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
             return STATUS_FAILED;
         }