Skip to content

Commit

Permalink
8251904: vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.jav…
Browse files Browse the repository at this point in the history
…a fails with ClassNotFoundException: nsk.sysdict.share.BTree0LLRLRLRRLR

Backport-of: 7ca053de218bf76ea06bbeed860d142db381ca53
  • Loading branch information
Amos Shi authored and GoeLin committed Dec 7, 2023
1 parent 050bbdb commit c77e538
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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:
Expand Down
10 changes: 4 additions & 6 deletions test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/SysDictTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2018, 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
Expand Down Expand Up @@ -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];
Expand Down Expand Up @@ -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
Expand All @@ -164,6 +161,7 @@ public void run() {
}
}


@Override
protected Runnable createRunnable(int i) {
currentClassLoaders = createClassLoadersInternal();
Expand Down

1 comment on commit c77e538

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.