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

8209837: Avoid initializing ExpiringCache during bootstrap

Browse source 
Reviewed-by: sundar, forax
This commit is contained in:
Claes Redestad 2018-08-24 14:04:34 +02:00
parent 9ec15cedd0
commit 5ddac96c10
3 changed files with 39 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/java.base/windows/classes/java/io/WinNTFileSystem.java
View file

@ -51,6 +51,8 @@ class WinNTFileSystem extends FileSystem {
semicolon = props.getProperty("path.separator").charAt(0);
altSlash = (this.slash == '\\') ? '/' : '\\';
userDir = normalize(props.getProperty("user.dir"));
cache = useCanonCaches ? new ExpiringCache() : null;
prefixCache = useCanonPrefixCache ? new ExpiringCache() : null;
}
private boolean isSlash(char c) {
@ -387,8 +389,8 @@ class WinNTFileSystem extends FileSystem {
// same directory, and must not create results differing from the true
// canonicalization algorithm in canonicalize_md.c. For this reason the
// prefix cache is conservative and is not used for complex path names.
private ExpiringCache cache = new ExpiringCache();
private ExpiringCache prefixCache = new ExpiringCache();
private final ExpiringCache cache;
private final ExpiringCache prefixCache;
@Override
public String canonicalize(String path) throws IOException {
@ -568,8 +570,12 @@ class WinNTFileSystem extends FileSystem {
// (i.e., only remove/update affected entries) but probably
// not worth it since these entries expire after 30 seconds
// anyway.
cache.clear();
prefixCache.clear();
if (useCanonCaches) {
cache.clear();
}
if (useCanonPrefixCache) {
prefixCache.clear();
}
return delete0(f);
}
@ -582,8 +588,12 @@ class WinNTFileSystem extends FileSystem {
// (i.e., only remove/update affected entries) but probably
// not worth it since these entries expire after 30 seconds
// anyway.
cache.clear();
prefixCache.clear();
if (useCanonCaches) {
cache.clear();
}
if (useCanonPrefixCache) {
prefixCache.clear();
}
return rename0(f1, f2);
}