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

[toad at freenetproject.org]

Author: toad
Date: 2007-02-03 18:45:08 +0000 (Sat, 03 Feb 2007)
New Revision: 11664

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Fix deadlock

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java	2007-02-03 17:00:40 UTC (rev 11663)
+++ trunk/freenet/src/freenet/node/PeerNode.java	2007-02-03 18:45:08 UTC (rev 11664)
@@ -1326,8 +1326,10 @@
 
     /**
      * @return short version of toString()
+     * *** Note that this is not synchronized! It is used by logging in code paths that
+     * will deadlock if it is synchronized! ***
      */
-    public synchronized String shortToString() {
+    public String shortToString() {
         return super.toString()+ '@' +detectedPeer+ '@' +HexUtil.bytesToHex(identity);
     }