8251904: vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.jav…

…a fails with ClassNotFoundException: nsk.sysdict.share.BTree0LLRLRLRRLR Backport-of: 7ca053de218bf76ea06bbeed860d142db381ca53
openjdk · Mar 11, 2022 · 535511a · 535511a · openjdk-notifier · Mar 11, 2022
1 parent 3b53635
commit 535511a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/BTreeTest.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/BTreeTest.java
@@ -59,7 +59,7 @@ protected void parseArgs(String args[]) {
         }
         try {
             // Load FatsInfo with URLClassLoader btree.jar & fats.jar should not
-            // present in classpath
+            // be present in classpath
             Class info;
             if (useFats) {
                 info = createJarLoader().loadClass(PACKAGE_PREFIX + "FatsInfo");
@@ -76,7 +76,7 @@ protected void parseArgs(String args[]) {
             }
 
             if (level >= height) {
-                throw new Failure("Icorrect level : " + level + " .Should be less then " + height);
+                throw new Failure("Incorrect level : " + level + " should be less than " + height);
             }
 
             // generate names for all nodes at the given level:

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/SysDictTest.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/SysDictTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ protected void parseArgs(String args[]) {
             if (args[i].equals("-useSingleLoader")) {
                 this.useSingleLoader = false;
             }
-            // jar path is in useal classpath format
+            // jar path is in usual classpath format
             if (args[i].equals("-jarpath")) {
                 String[] files = args[i + 1].split(File.pathSeparator);
                 jars = new URL[files.length];
@@ -148,11 +148,8 @@ public void run() {
                     // set name into public variable just to be sure
                     // that class is loaded
                     tmp = clz.getName();
-                } catch (ClassNotFoundException cnfe) {
-                    throw new TestFailure(cnfe);
-                } catch (OutOfMemoryError oome) {
+                } catch (OutOfMemoryError | ClassNotFoundException e) {
                     // just ignore
-                    // we do not check memory leaks in PermGen in this tests
                 } catch (StackOverflowError soe) {
                     // just ignore, chains could be too large
                     // StackOverflowError could be in some sparcs
@@ -164,6 +161,7 @@ public void run() {
         }
     }
 
+
     @Override
     protected Runnable createRunnable(int i) {
         currentClassLoaders = createClassLoadersInternal();