--- a/jdk/src/share/classes/java/awt/Component.java	Mon Mar 31 15:56:12 2008 +0400
+++ b/jdk/src/share/classes/java/awt/Component.java	Tue Apr 01 17:38:46 2008 +0400
@@ -634,7 +634,9 @@
      */
     private PropertyChangeSupport changeSupport;
 
-    private transient final Object changeSupportLock = new Object();
+    // Note: this field is considered final, though readObject() prohibits
+    // initializing final fields.
+    private transient Object changeSupportLock = new Object();
     private Object getChangeSupportLock() {
         return changeSupportLock;
     }
@@ -8310,6 +8312,8 @@
     private void readObject(ObjectInputStream s)
       throws ClassNotFoundException, IOException
     {
+        changeSupportLock = new Object();
+
         s.defaultReadObject();
 
         appContext = AppContext.getAppContext();