Author: toad
Date: 2007-11-29 12:14:06 +0000 (Thu, 29 Nov 2007)
New Revision: 16060

Modified:
   trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
Log:
Break nested locks and therefore fix UOM deadlock

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java       
2007-11-29 09:42:35 UTC (rev 16059)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java       
2007-11-29 12:14:06 UTC (rev 16060)
@@ -162,11 +162,12 @@
        }

        void broadcastUOMAnnounces() {
+               Message msg;
                synchronized(broadcastUOMAnnouncesSync) {
-                       Message msg = getUOMAnnouncement();
-                       node.peers.localBroadcast(msg, true);
+                       msg = getUOMAnnouncement();
                        broadcastUOMAnnounces = true;
                }
+               node.peers.localBroadcast(msg, true);
        }

        private Message getUOMAnnouncement() {


Reply via email to