Author: toad
Date: 2005-10-28 22:51:59 +0000 (Fri, 28 Oct 2005)
New Revision: 7464
Modified:
trunk/freenet/src/freenet/client/ArchiveManager.java
trunk/freenet/src/freenet/client/Metadata.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
Log:
Minor stuff.
Check whether key is actually a pure CHK before writing it as such in
Metadata.writeKey.
Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java 2005-10-28
20:51:43 UTC (rev 7463)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java 2005-10-28
22:51:59 UTC (rev 7464)
@@ -110,7 +110,7 @@
return ase.dataAsBucket();
}
- public synchronized void removeCachedItem(ArchiveStoreItem item) {
+ synchronized void removeCachedItem(ArchiveStoreItem item) {
storedData.removeKey(item.key);
}
Modified: trunk/freenet/src/freenet/client/Metadata.java
===================================================================
--- trunk/freenet/src/freenet/client/Metadata.java 2005-10-28 20:51:43 UTC
(rev 7463)
+++ trunk/freenet/src/freenet/client/Metadata.java 2005-10-28 22:51:59 UTC
(rev 7464)
@@ -6,6 +6,7 @@
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -313,6 +314,9 @@
if(fullKeys) {
freenetURI.writeFullBinaryKeyWithLength(dos);
} else {
+ String[] meta = freenetURI.getAllMetaStrings();
+ if(meta != null && meta.length > 0)
+ throw new MalformedURLException("Not a plain
CHK");
ClientKey key = ClientKey.getBaseKey(freenetURI);
if(key instanceof ClientCHK) {
((ClientCHK)key).writeRawBinaryKey(dos);
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2005-10-28
20:51:43 UTC (rev 7463)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2005-10-28
22:51:59 UTC (rev 7464)
@@ -39,14 +39,11 @@
final RandomSource r;
final Node n;
final Hashtable streams;
- private Writer subscribedDataStream;
- private String lastSendStreamName;
TextModeClientInterface(Node n) {
this.n = n;
this.r = n.random;
streams = new Hashtable();
- subscribedDataStream = new OutputStreamWriter(System.out);
new Thread(this).start();
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
