infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-11 14:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

8011219: Regression with recent PropertyMap history changes

Browse Source 
Reviewed-by: jlaskey, lagergren
This commit is contained in:
Hannes Wallnöfer 2013-04-02 13:55:49 +02:00
parent 1cfc0cae65
commit 10cd2de7ed
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
View File

@ -526,13 +526,11 @@ public final class PropertyMap implements Iterable<Object>, PropertyListener {
* @param newMap {@link PropertyMap} associated with prototype.
*/
private void addToProtoHistory(final ScriptObject newProto, final PropertyMap newMap) {
if (!properties.isEmpty()) {
if (protoHistory == null) {
protoHistory = new WeakHashMap<>();
}
protoHistory.put(newProto, new WeakReference<>(newMap));
if (protoHistory == null) {
protoHistory = new WeakHashMap<>();
}
protoHistory.put(newProto, new WeakReference<>(newMap));
}
/**
@ -542,13 +540,11 @@ public final class PropertyMap implements Iterable<Object>, PropertyListener {
* @param newMap Modified {@link PropertyMap}.
*/
private void addToHistory(final Property property, final PropertyMap newMap) {
if (!properties.isEmpty()) {
if (history == null) {
history = new LinkedHashMap<>();
}
history.put(property, newMap);
if (history == null) {
history = new LinkedHashMap<>();
}
history.put(property, newMap);
}
/**