[freenet-cvs] r10764 - trunk/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2006-10-31 18:50:50 +0000 (Tue, 31 Oct 2006)
New Revision: 10764

Modified:
   trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java
   trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
Log:
Don't infinitely recurse in healing if encode fails.

Modified: trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java      
2006-10-31 18:49:52 UTC (rev 10763)
+++ trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java      
2006-10-31 18:50:50 UTC (rev 10764)
@@ -83,7 +83,7 @@
                        runningInserters.remove(data);
                }
                if(Logger.shouldLog(Logger.MINOR, this))
-                       Logger.minor(this, "Successfully inserted healing 
block: "+sbi.getURI()+" for "+data+" ("+sbi.token+")");
+                       Logger.minor(this, "Successfully inserted healing 
block: "+sbi.getURINoEncode()+" for "+data+" ("+sbi.token+")");
                data.free();
        }

@@ -94,7 +94,7 @@
                        runningInserters.remove(data);
                }
                if(Logger.shouldLog(Logger.MINOR, this))
-                       Logger.minor(this, "Failed to insert healing block: 
"+sbi.getURI()+" : "+e+" for "+data+" ("+sbi.token+")", e);
+                       Logger.minor(this, "Failed to insert healing block: 
"+sbi.getURINoEncode()+" : "+e+" for "+data+" ("+sbi.token+")", e);
                data.free();
        }


Modified: trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleBlockInserter.java     
2006-10-31 18:49:52 UTC (rev 10763)
+++ trunk/freenet/src/freenet/client/async/SingleBlockInserter.java     
2006-10-31 18:50:50 UTC (rev 10764)
@@ -248,6 +248,10 @@
                }
        }

+       public synchronized FreenetURI getURINoEncode() {
+               return resultingURI;
+       }
+
        public void onSuccess() {
                if(logMINOR) Logger.minor(this, "Succeeded ("+this+"): "+token);
                synchronized(this) {