fix race condition

2 files changed, 5 insertions, 1 deletions

diff --git a/changelog b/changelog
index bd15764..9ff4efe 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ Version 2.4.1:
 	* Fix returning DBusSerializables (Spotted by Johannes Felten
 	  <johannesfelten -at- googlemail -dot- com>)
 	* Fix CreateInterface (Spotted by Tom Walsh <walshtc -at- gmail -dot- com>)
+	* Fix serial assignment race condition (Spotted by Ed Wei
+	  <Edward.Wei.03 -at- alum -dot- dartmouth -dot- org>)
 
 Version 2.4:
 
diff --git a/org/freedesktop/dbus/Message.java b/org/freedesktop/dbus/Message.java
index 4640630..c514002 100644
--- a/org/freedesktop/dbus/Message.java
+++ b/org/freedesktop/dbus/Message.java
@@ -177,7 +177,9 @@ public class Message
       headers = new HashMap<Byte, Object>();
       big = (Endian.BIG == endian);
       bytecounter = 0;
-      serial = ++globalserial;
+      synchronized (Message.class) {
+         serial = ++globalserial;
+      }
       if (Debug.debug) Debug.print(Debug.DEBUG, "Creating message with serial "+serial);
       this.type = type;
       this.flags = flags;