Merge pull request #98 from jmesnil/HORNETQ-912_synchronize_hardwareA…

…ddress Hornetq 912 synchronize hardware address
hornetq · Apr 19, 2012 · fef63b7 · fef63b7
2 parents a1a3638 + 6cdf879
commit fef63b7
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/main/org/hornetq/utils/UUIDGenerator.java b/src/main/org/hornetq/utils/UUIDGenerator.java
@@ -260,10 +260,19 @@ private final byte[] getAddressBytes()
    {
       if (address == null)
       {
-         address = UUIDGenerator.getHardwareAddress();
-         if (address == null)
+         // calling UUIDGenerator.getHardwareAddress() is a
+         // time-expensive operation, let make sure it is called
+         // only once
+         synchronized (this)
          {
-            address = generateDummyAddress();
+            if (address == null)
+            {
+               address = UUIDGenerator.getHardwareAddress();
+               if (address == null)
+               {
+                  address = generateDummyAddress();
+               }
+            }
          }
       }