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

[rob...@freenetproject.org]

Author: robert
Date: 2007-12-07 01:36:12 +0000 (Fri, 07 Dec 2007)
New Revision: 16386

Modified:
   trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
Log:
rename overloaded identifier, generates confusion (no code effect)


Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2007-12-07 00:03:30 UTC (rev 16385)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2007-12-07 01:36:12 UTC (rev 16386)
@@ -402,11 +402,11 @@
                                // Hopefully!
                                FreenetURI newURI = metadata.getSingleTarget();
                                if(logMINOR) Logger.minor(this, "Redirecting to 
"+newURI);
-                               ClientKey key;
+                               ClientKey redirectedKey;
                                try {
                                        BaseClientKey k = 
BaseClientKey.getBaseKey(newURI);
                                        if(k instanceof ClientKey)
-                                               key = (ClientKey) k;
+                                               redirectedKey = (ClientKey) k;
                                        else
                                                // FIXME do we want to allow 
redirects to USKs?
                                                // Without redirects to USKs, 
all SSK and CHKs are static.
@@ -424,9 +424,8 @@
                                        addedMetaStrings++;
                                }

-                               // **FIXME** Is key in the call to 
SingleFileFetcher here supposed to be this.key or the same key used in the try 
block above?  MultiLevelMetadataCallback.onSuccess() below uses this.key, thus 
the question
-                               final SingleFileFetcher f = new 
SingleFileFetcher(parent, rcb, clientMetadata, key, metaStrings, this.uri, 
addedMetaStrings, ctx, actx, ah, maxRetries, recursionLevel, false, token, 
true, returnBucket, isFinal);
-                               if((key instanceof ClientCHK) && 
!((ClientCHK)key).isMetadata())
+                               final SingleFileFetcher f = new 
SingleFileFetcher(parent, rcb, clientMetadata, redirectedKey, metaStrings, 
this.uri, addedMetaStrings, ctx, actx, ah, maxRetries, recursionLevel, false, 
token, true, returnBucket, isFinal);
+                               if((redirectedKey instanceof ClientCHK) && 
!((ClientCHK)redirectedKey).isMetadata())
                                        rcb.onBlockSetFinished(this);
                                if(metadata.isCompressed()) {
                                        Compressor codec = 
Compressor.getCompressionAlgorithmByMetadataID(metadata.getCompressionCodec());