archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6708322: test/closed/java/awt/Focus/TemporaryLostComponentDeadlock fails

Browse source 
Introduced new package private object for synchronization purposes. It should replace "this" in some deadlock prone cases.

Reviewed-by: anthony, art
This commit is contained in:
Anton Tarasov 2008-06-04 14:16:44 +04:00
parent ac0b8d6ebe
commit 4db94beee6
1 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

40
jdk/src/share/classes/java/awt/Component.java
View file

@ -635,11 +635,21 @@ public abstract class Component implements ImageObserver, MenuContainer,
*/ */
private PropertyChangeSupport changeSupport; private PropertyChangeSupport changeSupport;
// Note: this field is considered final, though readObject() prohibits /*
// initializing final fields. * In some cases using "this" as an object to synchronize by
private transient Object changeSupportLock = new Object(); * can lead to a deadlock if client code also uses synchronization
private Object getChangeSupportLock() { * by a component object. For every such situation revealed we should
return changeSupportLock; * consider possibility of replacing "this" with the package private
* objectLock object introduced below. So far there're 2 issues known:
* - CR 6708322 (the getName/setName methods);
* - CR 6608764 (the PropertyChangeListener machinery).
*
* Note: this field is considered final, though readObject() prohibits
* initializing final fields.
*/
private transient Object objectLock = new Object();
Object getObjectLock() {
return objectLock;
} }
boolean isPacked = false; boolean isPacked = false;
@ -812,7 +822,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
*/ */
public String getName() { public String getName() {
if (name == null && !nameExplicitlySet) { if (name == null && !nameExplicitlySet) {
synchronized(this) { synchronized(getObjectLock()) {
if (name == null && !nameExplicitlySet) if (name == null && !nameExplicitlySet)
name = constructComponentName(); name = constructComponentName();
} }
@ -829,7 +839,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
*/ */
public void setName(String name) { public void setName(String name) {
String oldName; String oldName;
synchronized(this) { synchronized(getObjectLock()) {
oldName = this.name; oldName = this.name;
this.name = name; this.name = name;
nameExplicitlySet = true; nameExplicitlySet = true;
@ -7838,7 +7848,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
*/ */
public void addPropertyChangeListener( public void addPropertyChangeListener(
PropertyChangeListener listener) { PropertyChangeListener listener) {
synchronized (getChangeSupportLock()) { synchronized (getObjectLock()) {
if (listener == null) { if (listener == null) {
return; return;
} }
@ -7864,7 +7874,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
*/ */
public void removePropertyChangeListener( public void removePropertyChangeListener(
PropertyChangeListener listener) { PropertyChangeListener listener) {
synchronized (getChangeSupportLock()) { synchronized (getObjectLock()) {
if (listener == null || changeSupport == null) { if (listener == null || changeSupport == null) {
return; return;
} }
@ -7887,7 +7897,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @since 1.4 * @since 1.4
*/ */
public PropertyChangeListener[] getPropertyChangeListeners() { public PropertyChangeListener[] getPropertyChangeListeners() {
synchronized (getChangeSupportLock()) { synchronized (getObjectLock()) {
if (changeSupport == null) { if (changeSupport == null) {
return new PropertyChangeListener[0]; return new PropertyChangeListener[0];
} }
@ -7929,7 +7939,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
public void addPropertyChangeListener( public void addPropertyChangeListener(
String propertyName, String propertyName,
PropertyChangeListener listener) { PropertyChangeListener listener) {
synchronized (getChangeSupportLock()) { synchronized (getObjectLock()) {
if (listener == null) { if (listener == null) {
return; return;
} }
@ -7959,7 +7969,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
public void removePropertyChangeListener( public void removePropertyChangeListener(
String propertyName, String propertyName,
PropertyChangeListener listener) { PropertyChangeListener listener) {
synchronized (getChangeSupportLock()) { synchronized (getObjectLock()) {
if (listener == null || changeSupport == null) { if (listener == null || changeSupport == null) {
return; return;
} }
@ -7983,7 +7993,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
*/ */
public PropertyChangeListener[] getPropertyChangeListeners( public PropertyChangeListener[] getPropertyChangeListeners(
String propertyName) { String propertyName) {
synchronized (getChangeSupportLock()) { synchronized (getObjectLock()) {
if (changeSupport == null) { if (changeSupport == null) {
return new PropertyChangeListener[0]; return new PropertyChangeListener[0];
} }
@ -8004,7 +8014,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
protected void firePropertyChange(String propertyName, protected void firePropertyChange(String propertyName,
Object oldValue, Object newValue) { Object oldValue, Object newValue) {
PropertyChangeSupport changeSupport; PropertyChangeSupport changeSupport;
synchronized (getChangeSupportLock()) { synchronized (getObjectLock()) {
changeSupport = this.changeSupport; changeSupport = this.changeSupport;
} }
if (changeSupport == null || if (changeSupport == null ||
@ -8306,7 +8316,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
private void readObject(ObjectInputStream s) private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException throws ClassNotFoundException, IOException
{ {
changeSupportLock = new Object(); objectLock = new Object();
s.defaultReadObject(); s.defaultReadObject();