Skip to content

Commit 7ca053d

Browse files
author
Harold Seigel
committed
8251904: vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java fails with ClassNotFoundException: nsk.sysdict.share.BTree0LLRLRLRRLR
Reviewed-by: dholmes, lmesnik
1 parent 4be88d5 commit 7ca053d

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/BTreeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected void parseArgs(String args[]) {
5959
}
6060
try {
6161
// Load FatsInfo with URLClassLoader btree.jar & fats.jar should not
62-
// present in classpath
62+
// be present in classpath
6363
Class info;
6464
if (useFats) {
6565
info = createJarLoader().loadClass(PACKAGE_PREFIX + "FatsInfo");
@@ -76,7 +76,7 @@ protected void parseArgs(String args[]) {
7676
}
7777

7878
if (level >= height) {
79-
throw new Failure("Icorrect level : " + level + " .Should be less then " + height);
79+
throw new Failure("Incorrect level : " + level + " should be less than " + height);
8080
}
8181

8282
// generate names for all nodes at the given level:

test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/SysDictTest.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ protected void parseArgs(String args[]) {
6262
if (args[i].equals("-useSingleLoader")) {
6363
this.useSingleLoader = false;
6464
}
65-
// jar path is in useal classpath format
65+
// jar path is in usual classpath format
6666
if (args[i].equals("-jarpath")) {
6767
String[] files = args[i + 1].split(File.pathSeparator);
6868
jars = new URL[files.length];
@@ -148,11 +148,8 @@ public void run() {
148148
// set name into public variable just to be sure
149149
// that class is loaded
150150
tmp = clz.getName();
151-
} catch (ClassNotFoundException cnfe) {
152-
throw new TestFailure(cnfe);
153-
} catch (OutOfMemoryError oome) {
151+
} catch (OutOfMemoryError | ClassNotFoundException e) {
154152
// just ignore
155-
// we do not check memory leaks in PermGen in this tests
156153
} catch (StackOverflowError soe) {
157154
// just ignore, chains could be too large
158155
// StackOverflowError could be in some sparcs
@@ -164,6 +161,7 @@ public void run() {
164161
}
165162
}
166163

164+
167165
@Override
168166
protected Runnable createRunnable(int i) {
169167
currentClassLoaders = createClassLoadersInternal();

0 commit comments

Comments
 (0)