echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge of '3f93d2c09c89b5c68487c33fd700ef7c2feeeb61'

Browse Source 
and 'b2c58f8462ab5c08682b711436c387b421bdd0c2'
This commit is contained in:
zzz
2013-12-10 11:11:08 +00:00
parent 0db1314595 7d3aa33c25
commit 289a8e7b40
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java
View File

@ -155,7 +155,7 @@ public class BEncoder
out.write(bs); out.write(bs);
} }
public static byte[] bencode(Map<String, Object> m) public static byte[] bencode(Map<?, ?> m)
{ {
try try
{ {
@ -169,23 +169,29 @@ public class BEncoder
} }
} }
public static void bencode(Map<String, Object> m, OutputStream out) throws IOException public static void bencode(Map<?, ?> m, OutputStream out)
throws IOException, IllegalArgumentException
{ {
out.write('d'); out.write('d');
// Keys must be sorted. XXX - But is this the correct order? // Keys must be sorted. XXX - But is this the correct order?
Set<String> s = m.keySet(); Set<?> s = m.keySet();
List<String> l = new ArrayList<String>(s); List<String> l = new ArrayList<String>(s.size());
for (Object k : s) {
// Keys must be Strings.
if (String.class.isAssignableFrom(k.getClass()))
l.add((String) k);
else
throw new IllegalArgumentException("Cannot bencode map: contains non-String key of type " + k.getClass());
}
Collections.sort(l); Collections.sort(l);
Iterator<String> it = l.iterator(); Iterator<String> it = l.iterator();
while(it.hasNext()) while(it.hasNext())
{ {
// Keys must be Strings.
String key = it.next(); String key = it.next();
Object value = m.get(key);
bencode(key, out); bencode(key, out);
bencode(value, out); bencode(m.get(key), out);
} }
out.write('e'); out.write('e');