1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8165984: ResourceBundle lookup fields not completely thread-safe

Browse Source 
Reviewed-by: okutsu, naoto
This commit is contained in:
Nishit Jain 2016-09-18 23:09:37 +09:00
parent f9d0a85678
commit 14d689c4a6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.base/share/classes/java/util/ListResourceBundle.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -206,5 +206,5 @@ public abstract class ListResourceBundle extends ResourceBundle {
lookup = temp; lookup = temp;
} }
private Map<String,Object> lookup = null; private volatile Map<String,Object> lookup = null;
} }

6
jdk/src/java.base/share/classes/java/util/PropertyResourceBundle.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -46,8 +46,6 @@ import java.io.IOException;
import java.nio.charset.MalformedInputException; import java.nio.charset.MalformedInputException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.charset.UnmappableCharacterException; import java.nio.charset.UnmappableCharacterException;
import java.security.AccessController;
import java.util.Locale;
import sun.security.action.GetPropertyAction; import sun.security.action.GetPropertyAction;
import sun.util.PropertyResourceBundleCharset; import sun.util.PropertyResourceBundleCharset;
import sun.util.ResourceBundleEnumeration; import sun.util.ResourceBundleEnumeration;
@ -236,5 +234,5 @@ public class PropertyResourceBundle extends ResourceBundle {
// ==================privates==================== // ==================privates====================
private Map<String,Object> lookup; private final Map<String,Object> lookup;
} }