archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Prasanta Sadhukhan 2018-12-11 10:47:37 +05:30
commit b3eb4c3ce8
3478 changed files with 69866 additions and 22997 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/java.base/windows/classes/jdk/internal/loader/FileURLMapper.java
View file

@ -55,7 +55,7 @@ public class FileURLMapper {
return file;
}
String host = url.getHost();
if (host != null && !host.equals("") &&
if (host != null && !host.isEmpty() &&
!"localhost".equalsIgnoreCase(host)) {
String rest = url.getFile();
String s = host + ParseUtil.decode (url.getFile());

2
src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java
View file

@ -83,7 +83,7 @@ public class Handler extends URLStreamHandler {
path = path.replace('/', '\\');
path = path.replace('|', ':');
if ((host == null) || host.equals("") ||
if ((host == null) || host.isEmpty() ||
host.equalsIgnoreCase("localhost") ||
host.equals("~")) {
return createFileURLConnection(url, new File(path));

2
src/java.base/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java
View file

@ -76,7 +76,7 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController {
// Deal with UNC pathnames specially. See 4180841
String host = url.getHost();
if (host != null && !host.equals("") &&
if (host != null && !host.isEmpty() &&
!host.equalsIgnoreCase("localhost")) {
url = new URL("file", "", "//" + host + url.getPath());

4
src/java.base/windows/classes/sun/nio/fs/WindowsUriSupport.java
View file

@ -128,12 +128,12 @@ class WindowsUriSupport {
if (uri.getRawQuery() != null)
throw new IllegalArgumentException("URI has a query component");
String path = uri.getPath();
if (path.equals(""))
if (path.isEmpty())
throw new IllegalArgumentException("URI path component is empty");
// UNC
String auth = uri.getRawAuthority();
if (auth != null && !auth.equals("")) {
if (auth != null && !auth.isEmpty()) {
String host = uri.getHost();
if (host == null)
throw new IllegalArgumentException("URI authority component has undefined host");