Author: toad
Date: 2007-06-15 22:09:04 +0000 (Fri, 15 Jun 2007)
New Revision: 13617
Modified:
trunk/freenet/src/freenet/keys/FreenetURI.java
Log:
Fix getPreferredFilename for USKs: <sitename>-<edition>[-<rest>]
Modified: trunk/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- trunk/freenet/src/freenet/keys/FreenetURI.java 2007-06-15 22:03:05 UTC
(rev 13616)
+++ trunk/freenet/src/freenet/keys/FreenetURI.java 2007-06-15 22:09:04 UTC
(rev 13617)
@@ -728,9 +728,12 @@
boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
Logger.minor(this, "Getting preferred filename for "+this);
Vector names = new Vector();
- if(keyType != null && (keyType.equals("KSK") ||
keyType.equals("SSK"))) {
+ if(keyType != null && (keyType.equals("KSK") ||
keyType.equals("SSK") || keyType.equals("USK"))) {
if(logMINOR) Logger.minor(this, "Adding docName:
"+docName);
names.add(docName);
+ if(keyType.equals("USK")) {
+ names.add(Long.toString(suggestedEdition));
+ }
}
if(metaStr != null)
for(int i=0;i<metaStr.length;i++) {
