diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e9a2a50cdce..cbb023adcc6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-17  Mark Wielaard  <mark@klomp.org>
+
+	* java/awt/event/InvocationEvent.java (dispatch): Synchronize
+	on notifier object before calling notifyAll().
+
 2004-07-17  Michael Koch  <konqueror@gmx.de>
 
 	* gnu/java/nio/channels/FileChannelImpl.java
diff --git a/libjava/java/awt/event/InvocationEvent.java b/libjava/java/awt/event/InvocationEvent.java
index fbf7b5e9379..76d4a558244 100644
--- a/libjava/java/awt/event/InvocationEvent.java
+++ b/libjava/java/awt/event/InvocationEvent.java
@@ -189,8 +189,13 @@ public class InvocationEvent extends AWTEvent implements ActiveEvent
         }
     else
       runnable.run();
-    if (notifier != null)
-      notifier.notifyAll();
+
+    Object o = notifier;
+    if (o != null)
+      synchronized(o)
+	{
+	  o.notifyAll();
+	}
   }
 
   /**