changeset in /hg/icedtea6: 2008-06-19 Lillian Angel <langel at re...
Lillian Angel
langel at redhat.com
Thu Jun 19 10:36:12 PDT 2008
changeset c9c356cd3adf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c9c356cd3adf
description:
2008-06-19 Lillian Angel <langel at redhat.com>
Fixes Bug #159
* patches/icedtea-component.patch: New file.
* Makefile.am (ICEDTEA_PATHCES): Add above patch.
* Makefile.in: Regenerated.
diffstat:
4 files changed, 169 insertions(+), 1 deletion(-)
ChangeLog | 7 +
Makefile.am | 1
Makefile.in | 3
patches/icedtea-component.patch | 159 +++++++++++++++++++++++++++++++++++++++
diffs (201 lines):
diff -r ac0e756d55cd -r c9c356cd3adf ChangeLog
--- a/ChangeLog Wed Jun 18 12:51:24 2008 -0700
+++ b/ChangeLog Thu Jun 19 13:35:47 2008 -0400
@@ -1,3 +1,10 @@ 2008-06-18 Keith Seitz <keiths at redhat.
+2008-06-19 Lillian Angel <langel at redhat.com>
+
+ Fixes Bug #159
+ * patches/icedtea-component.patch: New file.
+ * Makefile.am (ICEDTEA_PATHCES): Add above patch.
+ * Makefile.in: Regenerated.
+
2008-06-18 Keith Seitz <keiths at redhat.com>
* patches/icedtea-dnd-updatecursor.patch: New file.
diff -r ac0e756d55cd -r c9c356cd3adf Makefile.am
--- a/Makefile.am Wed Jun 18 12:51:24 2008 -0700
+++ b/Makefile.am Thu Jun 19 13:35:47 2008 -0400
@@ -330,6 +330,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-no-bcopy.patch \
patches/icedtea-jscheme.patch \
patches/icedtea-dnd-updatecursor.patch \
+ patches/icedtea-component.patch \
$(GCC_PATCH) \
$(DISTRIBUTION_PATCHES)
diff -r ac0e756d55cd -r c9c356cd3adf Makefile.in
--- a/Makefile.in Wed Jun 18 12:51:24 2008 -0700
+++ b/Makefile.in Thu Jun 19 13:35:47 2008 -0400
@@ -432,7 +432,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
- patches/icedtea-dnd-updatecursor.patch $(GCC_PATCH) \
+ patches/icedtea-dnd-updatecursor.patch \
+ patches/icedtea-component.patch $(GCC_PATCH) \
$(DISTRIBUTION_PATCHES) $(am__append_7)
# Patch OpenJDK for plug replacements and ecj.
diff -r ac0e756d55cd -r c9c356cd3adf patches/icedtea-component.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-component.patch Thu Jun 19 13:35:47 2008 -0400
@@ -0,0 +1,159 @@
+--- openjdk.old/jdk/src/share/classes/java/awt/Component.java Fri Mar 14 20:40:09 2008 +0300
++++ openjdk/jdk/src/share/classes/java/awt/Component.java Tue Mar 18 12:04:20 2008 +0300
+@@ -634,6 +634,11 @@ public abstract class Component implemen
+ */
+ private PropertyChangeSupport changeSupport;
+
++ private transient final Object changeSupportLock = new Object();
++ private Object getChangeSupportLock() {
++ return changeSupportLock;
++ }
++
+ boolean isPacked = false;
+
+ /**
+@@ -7839,15 +7844,17 @@ public abstract class Component implemen
+ * @see #getPropertyChangeListeners
+ * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
+ */
+- public synchronized void addPropertyChangeListener(
++ public void addPropertyChangeListener(
+ PropertyChangeListener listener) {
+- if (listener == null) {
+- return;
+- }
+- if (changeSupport == null) {
+- changeSupport = new PropertyChangeSupport(this);
+- }
+- changeSupport.addPropertyChangeListener(listener);
++ synchronized (getChangeSupportLock()) {
++ if (listener == null) {
++ return;
++ }
++ if (changeSupport == null) {
++ changeSupport = new PropertyChangeSupport(this);
++ }
++ changeSupport.addPropertyChangeListener(listener);
++ }
+ }
+
+ /**
+@@ -7863,12 +7870,14 @@ public abstract class Component implemen
+ * @see #getPropertyChangeListeners
+ * @see #removePropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener)
+ */
+- public synchronized void removePropertyChangeListener(
++ public void removePropertyChangeListener(
+ PropertyChangeListener listener) {
+- if (listener == null || changeSupport == null) {
+- return;
+- }
+- changeSupport.removePropertyChangeListener(listener);
++ synchronized (getChangeSupportLock()) {
++ if (listener == null || changeSupport == null) {
++ return;
++ }
++ changeSupport.removePropertyChangeListener(listener);
++ }
+ }
+
+ /**
+@@ -7885,11 +7894,13 @@ public abstract class Component implemen
+ * @see java.beans.PropertyChangeSupport#getPropertyChangeListeners
+ * @since 1.4
+ */
+- public synchronized PropertyChangeListener[] getPropertyChangeListeners() {
+- if (changeSupport == null) {
+- return new PropertyChangeListener[0];
+- }
+- return changeSupport.getPropertyChangeListeners();
++ public PropertyChangeListener[] getPropertyChangeListeners() {
++ synchronized (getChangeSupportLock()) {
++ if (changeSupport == null) {
++ return new PropertyChangeListener[0];
++ }
++ return changeSupport.getPropertyChangeListeners();
++ }
+ }
+
+ /**
+@@ -7923,16 +7934,18 @@ public abstract class Component implemen
+ * @see #getPropertyChangeListeners(java.lang.String)
+ * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
+ */
+- public synchronized void addPropertyChangeListener(
++ public void addPropertyChangeListener(
+ String propertyName,
+ PropertyChangeListener listener) {
+- if (listener == null) {
+- return;
+- }
+- if (changeSupport == null) {
+- changeSupport = new PropertyChangeSupport(this);
+- }
+- changeSupport.addPropertyChangeListener(propertyName, listener);
++ synchronized (getChangeSupportLock()) {
++ if (listener == null) {
++ return;
++ }
++ if (changeSupport == null) {
++ changeSupport = new PropertyChangeSupport(this);
++ }
++ changeSupport.addPropertyChangeListener(propertyName, listener);
++ }
+ }
+
+ /**
+@@ -7951,13 +7964,15 @@ public abstract class Component implemen
+ * @see #getPropertyChangeListeners(java.lang.String)
+ * @see #removePropertyChangeListener(java.beans.PropertyChangeListener)
+ */
+- public synchronized void removePropertyChangeListener(
++ public void removePropertyChangeListener(
+ String propertyName,
+ PropertyChangeListener listener) {
+- if (listener == null || changeSupport == null) {
+- return;
+- }
+- changeSupport.removePropertyChangeListener(propertyName, listener);
++ synchronized (getChangeSupportLock()) {
++ if (listener == null || changeSupport == null) {
++ return;
++ }
++ changeSupport.removePropertyChangeListener(propertyName, listener);
++ }
+ }
+
+ /**
+@@ -7974,12 +7989,14 @@ public abstract class Component implemen
+ * @see #getPropertyChangeListeners
+ * @since 1.4
+ */
+- public synchronized PropertyChangeListener[] getPropertyChangeListeners(
++ public PropertyChangeListener[] getPropertyChangeListeners(
+ String propertyName) {
+- if (changeSupport == null) {
+- return new PropertyChangeListener[0];
+- }
+- return changeSupport.getPropertyChangeListeners(propertyName);
++ synchronized (getChangeSupportLock()) {
++ if (changeSupport == null) {
++ return new PropertyChangeListener[0];
++ }
++ return changeSupport.getPropertyChangeListeners(propertyName);
++ }
+ }
+
+ /**
+@@ -7994,7 +8011,10 @@ public abstract class Component implemen
+ */
+ protected void firePropertyChange(String propertyName,
+ Object oldValue, Object newValue) {
+- PropertyChangeSupport changeSupport = this.changeSupport;
++ PropertyChangeSupport changeSupport;
++ synchronized (getChangeSupportLock()) {
++ changeSupport = this.changeSupport;
++ }
+ if (changeSupport == null ||
+ (oldValue != null && newValue != null && oldValue.equals(newValue))) {
+ return;
More information about the distro-pkg-dev
mailing list