[freenet-cvs] r8927 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2006-05-29 18:27:12 +0000 (Mon, 29 May 2006)
New Revision: 8927

Modified:
   trunk/freenet/src/freenet/node/CHKInsertSender.java
   trunk/freenet/src/freenet/node/RequestSender.java
   trunk/freenet/src/freenet/node/Version.java
Log:
750: Fix deadlock (don't need to lock PeerManager to call closerPeer).

Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2006-05-29 18:13:06 UTC 
(rev 8926)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2006-05-29 18:27:12 UTC 
(rev 8927)
@@ -218,13 +218,11 @@
             PeerNode next;
             // Can backtrack, so only route to nodes closer than we are to 
target.
             double nextValue;
-            synchronized(node.peers) {
-                next = node.peers.closerPeer(source, nodesRoutedTo, 
nodesNotIgnored, target, true);
-                if(next != null)
-                    nextValue = next.getLocation().getValue();
-                else
-                    nextValue = -1.0;
-            }
+            next = node.peers.closerPeer(source, nodesRoutedTo, 
nodesNotIgnored, target, true);
+            if(next != null)
+                nextValue = next.getLocation().getValue();
+            else
+                nextValue = -1.0;

             if(next == null) {
                 // Backtrack

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2006-05-29 18:13:06 UTC 
(rev 8926)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2006-05-29 18:27:12 UTC 
(rev 8927)
@@ -116,13 +116,11 @@
             // Route it
             PeerNode next;
             double nextValue;
-            synchronized(node.peers) {
-                next = node.peers.closerPeer(source, nodesRoutedTo, 
nodesNotIgnored, target, true);
-                if(next != null)
-                    nextValue = next.getLocation().getValue();
-                else
-                    nextValue = -1.0;
-            }
+            next = node.peers.closerPeer(source, nodesRoutedTo, 
nodesNotIgnored, target, true);
+            if(next != null)
+                nextValue = next.getLocation().getValue();
+            else
+                nextValue = -1.0;

             if(next == null) {
                 // Backtrack

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-29 18:13:06 UTC (rev 
8926)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-29 18:27:12 UTC (rev 
8927)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 749;
+       private static final int buildNumber = 750;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 732;