On Monday 09 March 2009 00:43:42 Daniel Cheng wrote: > On Sun, Mar 8, 2009 at 5:17 AM, <[email protected]> wrote: > > Author: toad > > Date: 2009-03-07 21:17:27 +0000 (Sat, 07 Mar 2009) > > New Revision: 25955 > > > > Modified: > > branches/db4o/freenet/src/freenet/client/InsertBlock.java > > branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java > > Log: > > Don't clone here, we can just pass it on > > > > > > Modified: branches/db4o/freenet/src/freenet/client/InsertBlock.java > > =================================================================== > > --- branches/db4o/freenet/src/freenet/client/InsertBlock.java 2009-03-07 21:05:53 UTC (rev 25954) > > +++ branches/db4o/freenet/src/freenet/client/InsertBlock.java 2009-03-07 21:17:27 UTC (rev 25955) > > @@ -67,10 +67,15 @@ > > } > > > > /** Null out the data so it doesn't get removed in removeFrom(). > > - * Call this when the data becomes somebody else's problem. You should clone() > > - * the desiredURI and clientMetadata, since these are always removed. */ > > + * Call this when the data becomes somebody else's problem. */ > > public void nullData() { > > data = null; > > } > > + > > + /** Null out the URI so it doesn't get removed in removeFrom(). > > + * Call this when the URI becomes somebody else's problem. */ > > + public void nullURI() { > > + this.desiredURI = null; > > + } > > > > } > > > > Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java > > =================================================================== > > --- branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java 2009-03-07 21:05:53 UTC (rev 25954) > > +++ branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java 2009-03-07 21:17:27 UTC (rev 25955) > > @@ -196,6 +196,7 @@ > > int blockSize; > > int oneBlockCompressedSize; > > > > + boolean isCHK = false; > > String type = block.desiredURI.getKeyType(); > > if(type.equals("SSK") || type.equals("KSK") || type.equals("USK")) { > > Some code is handling keyType using "equalsIgnoreCase()", but some are not. > Is this a bug?
Yes, however didn't I change it to .isSSK() || .isKSK() || .isUSK() ?
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Devl mailing list [email protected] http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
