[freenet-dev] [freenet-cvs] r16875 - trunk/freenet/src/freenet/node/fcp

[Matthew Toseland]

On Friday 04 January 2008 03:43, you wrote:
> Author: robert
> Date: 2008-01-04 03:43:44 +0000 (Fri, 04 Jan 2008)
> New Revision: 16875
> 
> Modified:
>    trunk/freenet/src/freenet/node/fcp/ClientGet.java
>    trunk/freenet/src/freenet/node/fcp/ClientPut.java
>    trunk/freenet/src/freenet/node/fcp/ClientRequest.java
> Log:
> always set start=true if finished==true (bug#1962), persist 'finished' for 
put requests (?!)

Don't do that (the latter). It's set already in super.toFieldSet(). The code 
will now throw because it is set twice. I'll revert it.
> 
> Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/fcp/ClientGet.java	2008-01-04 03:18:41 
UTC (rev 16874)
> +++ trunk/freenet/src/freenet/node/fcp/ClientGet.java	2008-01-04 03:43:44 
UTC (rev 16875)
> @@ -308,12 +308,8 @@
>  			client.queueClientRequestMessage(msg, 0);
>  		}
>  
> -		if(finished){
> -			if(succeeded) 
> +		if(finished && succeeded)
>  				allDataPending = new AllDataMessage(returnBucket, identifier, global, 
startupTime, completionTime);
> -			else
> -				started = true;
> -		}
>  	}
>  
>  	public void start() {
> 
> Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/fcp/ClientPut.java	2008-01-04 03:18:41 
UTC (rev 16874)
> +++ trunk/freenet/src/freenet/node/fcp/ClientPut.java	2008-01-04 03:43:44 
UTC (rev 16875)
> @@ -411,6 +411,7 @@
>  			fs.putSingle("TargetFilename", targetFilename);
>  		fs.putSingle("EarlyEncode", Boolean.toString(earlyEncode));
>  		fs.put("BinaryBlob", binaryBlob);
> +		fs.putSingle("Finished", Boolean.toString(finished));
>  		
>  		return fs;
>  	}
> 
> Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/fcp/ClientRequest.java	2008-01-04 
03:18:41 UTC (rev 16874)
> +++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java	2008-01-04 
03:43:44 UTC (rev 16875)
> @@ -107,6 +107,8 @@
>  		final String stime = fs.get("StartupTime");
>  		this.startupTime = stime == null ? System.currentTimeMillis() : 
Fields.parseLong(stime);
>  		completionTime = fs.getLong("CompletionTime", 0);
> +		if (finished)
> +			started=true;
>  	}
>  
>  	/** Lost connection */
> 
> _______________________________________________
> cvs mailing list
> cvs at freenetproject.org
> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
> 
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://emu.freenetproject.org/pipermail/devl/attachments/20080104/40ddfe06/attachment.pgp