Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
8278967: rmiregistry fails to start because SecurityManager is disabled
Reviewed-by: alanb, erikj
  • Loading branch information
Stuart Marks committed Dec 22, 2021
1 parent 2be3e7e commit 04ee921
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions make/modules/java.rmi/Launcher.gmk
Expand Up @@ -27,4 +27,5 @@ include LauncherCommon.gmk

$(eval $(call SetupBuildLauncher, rmiregistry, \
MAIN_CLASS := sun.rmi.registry.RegistryImpl, \
JAVA_ARGS := -Djava.security.manager=allow, \
))
9 changes: 6 additions & 3 deletions test/jdk/tools/launcher/VersionCheck.java
Expand Up @@ -23,7 +23,7 @@

/**
* @test
* @bug 6545058 6611182 8016209 8139986 8162746
* @bug 6545058 6611182 8016209 8139986 8162746 8278967
* @summary validate and test -version, -fullversion, and internal, as well as
* sanity checks if a tool can be launched.
* @modules jdk.compiler
Expand Down Expand Up @@ -126,9 +126,12 @@ static String getVersion(String... argv) {
static String getVersion0(boolean allLines, String... argv) {
TestHelper.TestResult tr = doExec(argv);
StringBuilder out = new StringBuilder();
// remove the HotSpot line
// remove the HotSpot line and security manager deprecation warnings
for (String x : tr.testOutput) {
if (allLines || !x.matches(".*Client.*VM.*|.*Server.*VM.*")) {
if (allLines || !x.matches(".*Client.*VM.*|" +
".*Server.*VM.*|" +
"WARNING:.*terminally.*deprecated.*|" +
"WARNING:.*System::setSecurityManager.*")) {
out = out.append(x + "\n");
}
}
Expand Down

1 comment on commit 04ee921

@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.