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

7180976: Pending String deadlocks UIDefaults

Browse Source 
Reviewed-by: azvegint, alexsch
This commit is contained in:
Sergey Bylokhov 2014-12-25 14:43:49 +03:00
parent 6ada61f007
commit d5a220d673
3 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/java.desktop/share/classes/javax/swing/UIDefaults.java
View File

@ -44,9 +44,7 @@ import java.awt.Font;
import java.awt.Color;
import java.awt.Insets;
import java.awt.Dimension;
import java.lang.reflect.Method;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeEvent;
import java.security.AccessController;
import java.security.AccessControlContext;
import java.security.PrivilegedAction;
@ -76,7 +74,7 @@ import sun.util.CoreResourceBundleControl;
@SuppressWarnings("serial") // Same-version serialization only
public class UIDefaults extends Hashtable<Object,Object>
{
private static final Object PENDING = "Pending";
private static final Object PENDING = new Object();
private SwingPropertyChangeSupport changeSupport;
@ -170,7 +168,7 @@ public class UIDefaults extends Hashtable<Object,Object>
* Looks up the given key in our Hashtable and resolves LazyValues
* or ActiveValues.
*/
private Object getFromHashtable(Object key) {
private Object getFromHashtable(final Object key) {
/* Quickly handle the common case, without grabbing
* a lock.
*/

4
jdk/src/java.desktop/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java
View File

@ -28,7 +28,6 @@ import javax.swing.plaf.synth.*;
import java.awt.*;
import java.util.*;
import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.plaf.*;
/**
@ -44,7 +43,8 @@ import javax.swing.plaf.*;
* @author Scott Violet
*/
public class DefaultSynthStyle extends SynthStyle implements Cloneable {
private static final String PENDING = "Pending";
private static final Object PENDING = new Object();
/**
* Should the component be opaque?

50
jdk/test/javax/swing/UIDefaults/7180976/Pending.java Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
/**
* @test
* @bug 7180976
* @author Sergey Bylokhov
*/
public final class Pending implements Runnable {
private static volatile boolean passed;
public static void main(final String[] args) throws Exception {
SwingUtilities.invokeLater(new Pending());
Thread.sleep(10000);
if (!passed) {
throw new RuntimeException("Test failed");
}
}
@Override
public void run() {
UIManager.put("foobar", "Pending");
UIManager.get("foobar");
passed = true;
}
}