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

[t...@freenetproject.org]

Author: toad
Date: 2008-04-02 13:37:52 +0000 (Wed, 02 Apr 2008)
New Revision: 18912

Modified:
   trunk/freenet/src/freenet/node/SendableGet.java
Log:
No need to synchronize here ... and doing so was causing a deadlock!

Modified: trunk/freenet/src/freenet/node/SendableGet.java
===================================================================
--- trunk/freenet/src/freenet/node/SendableGet.java     2008-04-02 11:37:57 UTC 
(rev 18911)
+++ trunk/freenet/src/freenet/node/SendableGet.java     2008-04-02 13:37:52 UTC 
(rev 18912)
@@ -71,13 +71,11 @@
                        return false;
                }
                boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
-                       synchronized (this) {
                                if(isCancelled()) {
                                        if(logMINOR) Logger.minor(this, 
"Cancelled: "+this);
                                        onFailure(new 
LowLevelGetException(LowLevelGetException.CANCELLED), null, sched);
                                        return false;
-                               }       
-                       }
+                               }
                        if(key == null) {
                                if(!isCancelled()) {
                                        Logger.error(this, "Not cancelled but 
key "+keyNum+" is null?! on "+this);