Skip to content

8276139: TestJpsHostName.java not reliable, better to expand HostIdentifierCreate.java test #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

8276139: TestJpsHostName.java not reliable, better to expand HostIdentifierCreate.java test #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71d48cc
Backport 2af9e5976fdf94afc7dbe5ad7827553818057bae
yaqsun Dec 28, 2023
abac7c7
Backport 2af9e5976fdf94afc7dbe5ad7827553818057bae
yaqsun Dec 29, 2023
1f481e2
Backport 2af9e5976fdf94afc7dbe5ad7827553818057bae
yaqsun Dec 29, 2023
ed40482
trigger test
yaqsun Jan 9, 2024
d209079
del temporary file test.txt
yaqsun Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion jdk/src/share/classes/sun/jvmstat/monitor/HostIdentifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2020, 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 @@ -112,6 +112,11 @@ private URI canonicalize(String uriString) throws URISyntaxException {
return new URI(uriString);
}

if (Character.isDigit(uriString.charAt(0))) {
// may be hostname or hostname:port since it starts with digits
uriString = "//" + uriString;
}

URI u = new URI(uriString);

if (u.isAbsolute()) {
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*
* @test
* @bug 4990825
* @bug 4990825 8251155
* @summary test that HostIdentifier objects get created as expected
*/

Expand Down
14 changes: 14 additions & 0 deletions jdk/test/sun/jvmstat/monitor/HostIdentifier/testcases
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,4 +218,18 @@ special syntax - not a valid URI, but allowed by HostIdentifier
<HostIdentifier> rmi://10.0.0.1:1234 </HostIdentifier>
</testcase>

<testcase id="31" HostIdentifierInput="12345">
<description>
Purely numeric
</description>
<HostIdentifier> //12345 </HostIdentifier>
</testcase>

<testcase id="32" HostIdentifierInput="12345:123">
<description>
Purely numeric
</description>
<HostIdentifier> //12345:123 </HostIdentifier>
</testcase>

</HostIdentifierTests>