Author: nextgens
Date: 2006-07-10 14:15:57 +0000 (Mon, 10 Jul 2006)
New Revision: 9547
Modified:
trunk/freenet/src/freenet/config/FilePersistentConfig.java
trunk/freenet/src/freenet/keys/FreenetURI.java
trunk/freenet/src/freenet/keys/Key.java
trunk/freenet/src/freenet/keys/NodeCHK.java
trunk/freenet/src/freenet/keys/NodeSSK.java
trunk/freenet/src/freenet/keys/SSKBlock.java
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
trunk/freenet/src/org/spaceroots/mantissa/random/MersenneTwister.java
Log:
* Polishing of the declaration of some serialization longs...
* Implementation of Clonable() in FreenetURI
* add a missing synchronization in FilePersistentConfig
Modified: trunk/freenet/src/freenet/config/FilePersistentConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/FilePersistentConfig.java 2006-07-10
13:04:46 UTC (rev 9546)
+++ trunk/freenet/src/freenet/config/FilePersistentConfig.java 2006-07-10
14:15:57 UTC (rev 9547)
@@ -81,7 +81,9 @@
try {
LineReadingInputStream lis = new
LineReadingInputStream(bis);
// Config file is UTF-8 too!
- origConfigFileContents = new SimpleFieldSet(lis, 32768,
128, true, true, true);
+ synchronized (this) {
+ origConfigFileContents = new
SimpleFieldSet(lis, 32768, 128, true, true, true);
+ }
} finally {
try {
fis.close();
Modified: trunk/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- trunk/freenet/src/freenet/keys/FreenetURI.java 2006-07-10 13:04:46 UTC
(rev 9546)
+++ trunk/freenet/src/freenet/keys/FreenetURI.java 2006-07-10 14:15:57 UTC
(rev 9547)
@@ -62,7 +62,7 @@
* REDFLAG: Old code has a FieldSet, and the ability to put arbitrary metadata
* in through name/value pairs. Do we want this?
*/
-public class FreenetURI {
+public class FreenetURI implements Cloneable{
private final String keyType, docName;
private final String[] metaStr;
@@ -115,7 +115,7 @@
}
}
- public Object clone() {
+ public final Object clone() {
return new FreenetURI(this);
}
Modified: trunk/freenet/src/freenet/keys/Key.java
===================================================================
--- trunk/freenet/src/freenet/keys/Key.java 2006-07-10 13:04:46 UTC (rev
9546)
+++ trunk/freenet/src/freenet/keys/Key.java 2006-07-10 14:15:57 UTC (rev
9547)
@@ -94,6 +94,11 @@
return hash;
}
+ public boolean equals(Object o){
+ if(o == null) return false;
+ return this.hash == o.hashCode();
+ }
+
static Bucket decompress(boolean isCompressed, byte[] output,
BucketFactory bf, int maxLength, short compressionAlgorithm, boolean
shortLength) throws CHKDecodeException, IOException {
if(isCompressed) {
Logger.minor(Key.class, "Decompressing "+output.length+" bytes
in decode with codec "+compressionAlgorithm);
Modified: trunk/freenet/src/freenet/keys/NodeCHK.java
===================================================================
--- trunk/freenet/src/freenet/keys/NodeCHK.java 2006-07-10 13:04:46 UTC (rev
9546)
+++ trunk/freenet/src/freenet/keys/NodeCHK.java 2006-07-10 14:15:57 UTC (rev
9547)
@@ -57,6 +57,10 @@
}
return false;
}
+
+ public int hashCode(){
+ return super.hashCode();
+ }
public short getType() {
return TYPE;
Modified: trunk/freenet/src/freenet/keys/NodeSSK.java
===================================================================
--- trunk/freenet/src/freenet/keys/NodeSSK.java 2006-07-10 13:04:46 UTC (rev
9546)
+++ trunk/freenet/src/freenet/keys/NodeSSK.java 2006-07-10 14:15:57 UTC (rev
9547)
@@ -144,9 +144,8 @@
// same hash, yet different
keys!
Logger.error(this, "Found
SHA-256 collision or something... WTF?");
throw new
SSKVerifyException("Invalid new pubkey: "+pubKey2+" old pubkey: "+pubKey);
- } else {
- // Valid key, assign.
- }
+ }
+ // Valid key, assign.
} else {
throw new SSKVerifyException("New
pubkey has invalid hash");
}
Modified: trunk/freenet/src/freenet/keys/SSKBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/SSKBlock.java 2006-07-10 13:04:46 UTC
(rev 9546)
+++ trunk/freenet/src/freenet/keys/SSKBlock.java 2006-07-10 14:15:57 UTC
(rev 9547)
@@ -75,6 +75,10 @@
return true;
}
+ public int hashCode(){
+ return super.hashCode();
+ }
+
/**
* Initialize, and verify data, headers against key. Provided
* key must have a pubkey, or we throw.
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-07-10
13:04:46 UTC (rev 9546)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-07-10
14:15:57 UTC (rev 9547)
@@ -74,7 +74,7 @@
private long lastRecentlyUsed;
private final Object lastRecentlyUsedSync = new Object();
- private boolean closed = false;
+ private boolean closed;
private final static byte[] dummy = new byte[0];
/**
Modified: trunk/freenet/src/org/spaceroots/mantissa/random/MersenneTwister.java
===================================================================
--- trunk/freenet/src/org/spaceroots/mantissa/random/MersenneTwister.java
2006-07-10 13:04:46 UTC (rev 9546)
+++ trunk/freenet/src/org/spaceroots/mantissa/random/MersenneTwister.java
2006-07-10 14:15:57 UTC (rev 9547)
@@ -71,7 +71,7 @@
public class MersenneTwister
extends Random {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
/** Creates a new random number generator.
* <p>The instance is initialized using the current time as the
