mirror of
https://github.com/openjdk/jdk.git
synced 2026-04-14 00:49:42 +00:00
Merge
This commit is contained in:
commit
6de8a21e10
@ -73,29 +73,32 @@ public class MimeTable implements FileNameMap {
|
||||
|
||||
private static final String filePreamble = "sun.net.www MIME content-types table";
|
||||
private static final String fileMagic = "#" + filePreamble;
|
||||
private static MimeTable defaultInstance = null;
|
||||
|
||||
MimeTable() {
|
||||
load();
|
||||
}
|
||||
|
||||
private static class DefaultInstanceHolder {
|
||||
static final MimeTable defaultInstance = getDefaultInstance();
|
||||
|
||||
static MimeTable getDefaultInstance() {
|
||||
return java.security.AccessController.doPrivileged(
|
||||
new java.security.PrivilegedAction<MimeTable>() {
|
||||
public MimeTable run() {
|
||||
MimeTable instance = new MimeTable();
|
||||
URLConnection.setFileNameMap(instance);
|
||||
return instance;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the single instance of this class. First use will load the
|
||||
* table from a data file.
|
||||
*/
|
||||
public static MimeTable getDefaultTable() {
|
||||
if (defaultInstance == null) {
|
||||
java.security.AccessController.doPrivileged(
|
||||
new java.security.PrivilegedAction<Void>() {
|
||||
public Void run() {
|
||||
defaultInstance = new MimeTable();
|
||||
URLConnection.setFileNameMap(defaultInstance);
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return defaultInstance;
|
||||
return DefaultInstanceHolder.defaultInstance;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user