[freenet-cvs] r8325 - in trunk/freenet/src/freenet: client/async clients/http node

[d...@freenetproject.org]

Author: dbkr
Date: 2006-03-26 17:41:48 +0000 (Sun, 26 Mar 2006)
New Revision: 8325

Modified:
   trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
   trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
   trunk/freenet/src/freenet/node/Version.java
Log:
577: Fix a bug whereby USK requests were scheduled twice, meaning the metadata 
was handled twice, meaning that only the default document was accessible from a 
USK.

Also don't carry on and try to handle an HTTP request if we couldn't find a 
Toadlet.


Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-03-26 00:16:14 UTC (rev 8324)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-03-26 17:41:48 UTC (rev 8325)
@@ -534,7 +534,6 @@
                                        new SingleFileFetcher(parent, myCB, 
clientMetadata, usk.getSSK(usk.suggestedEdition),
                                                        metaStrings, ctx, actx, 
maxRetries, recursionLevel, dontTellClientGet,
                                                        token, false, 
returnBucket);
-                               sf.schedule();
                                // Background fetch
                                
ctx.uskManager.startTemporaryBackgroundFetcher(usk);
                                return sf;

Modified: trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java      
2006-03-26 00:16:14 UTC (rev 8324)
+++ trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java      
2006-03-26 17:41:48 UTC (rev 8325)
@@ -225,8 +225,10 @@

                                        Toadlet t = container.findToadlet(uri);

-                                       if(t == null)
+                                       if(t == null) {
                                                
ctx.sendNoToadletError(shouldDisconnect);
+                                               break;
+                                       }

                                        if(method.equals("GET")) {
                                                try {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-26 00:16:14 UTC (rev 
8324)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-26 17:41:48 UTC (rev 
8325)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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