Author: toad
Date: 2009-02-26 18:28:21 +0000 (Thu, 26 Feb 2009)
New Revision: 25837
Modified:
trunk/freenet/
trunk/freenet/src/freenet/client/
trunk/freenet/src/freenet/keys/ClientSSKBlock.java
Log:
Merge 25505 from db4o: key should be final
Property changes on: trunk/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25290,25332,25351-25352,25355-25356,25479,25488,25540,25594
+ /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25290,25332,25351-25352,25355-25356,25479,25488,25505,25540,25594
Property changes on: trunk/freenet/src/freenet/client
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/db4o/freenet/src/freenet/client:24785,25282,25290,25332,25351-25353,25355-25356,25479,25488,25540,25594
/branches/db4o/src/freenet/client:25594
+
/branches/db4o/freenet/src/freenet/client:24785,25282,25290,25332,25351-25353,25355-25356,25479,25488,25505,25540,25594
/branches/db4o/src/freenet/client:25594
Modified: trunk/freenet/src/freenet/keys/ClientSSKBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientSSKBlock.java 2009-02-26 18:25:43 UTC
(rev 25836)
+++ trunk/freenet/src/freenet/keys/ClientSSKBlock.java 2009-02-26 18:28:21 UTC
(rev 25837)
@@ -26,7 +26,7 @@
/** Has decoded? */
private boolean decoded;
/** Client-key. This contains the decryption key etc. */
- private ClientSSK key;
+ private final ClientSSK key;
/** Compression algorithm from last time tried to decompress. */
private short compressionAlgorithm = -1;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
