infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 18:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

8283049: Fix non-singleton LoggerFinder error message: s/on/one

Browse Source 
Reviewed-by: dfuchs
This commit is contained in:
Carter Kozak 2022-03-14 17:54:19 +00:00 committed by Daniel Fuchs
parent 7833667f0e
commit 70bd57ed35
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2022, 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
@ -129,7 +129,7 @@ public final class LoggerFinderLoader {
result = iterator.next();
if (iterator.hasNext() && ensureSingletonProvider()) {
throw new ServiceConfigurationError(
"More than on LoggerFinder implementation");
"More than one LoggerFinder implementation");
}
} else {
result = loadDefaultImplementation();

6
test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2022, 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
@ -53,7 +53,7 @@ import java.util.concurrent.atomic.AtomicReference;
/**
* @test
* @bug 8140364 8189291
* @bug 8140364 8189291 8283049
* @summary JDK implementation specific unit test for LoggerFinderLoader.
* Tests the behavior of LoggerFinderLoader with respect to the
* value of the internal diagnosability switches. Also test the
@ -230,7 +230,7 @@ public class LoggerFinderLoaderTest {
throw new RuntimeException("Expected message not found. Error stream contained: " + warning);
}
} else if (singleton) {
if (!warning.contains("java.util.ServiceConfigurationError: More than on LoggerFinder implementation")) {
if (!warning.contains("java.util.ServiceConfigurationError: More than one LoggerFinder implementation")) {
throw new RuntimeException("Expected message not found. Error stream contained: " + warning);
}
}