propagate from branch 'i2p.i2p.zzz.test2' (head 47586aa88408845c51ee4c5fce40c617bdb8e398)

to branch 'i2p.i2p' (head bacb6048bc596f064ff237dd8569014a421b4ef6)
This commit is contained in:
zzz
2015-06-03 11:40:28 +00:00
6 changed files with 23 additions and 8 deletions

View File

@ -18,7 +18,7 @@ public class CoreVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = "0.9.19";
public final static String VERSION = "0.9.20";
/**
* For Vuze.

View File

@ -262,8 +262,14 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste
/** reseed the fortuna */
@Override
public void feedEntropy(String source, byte[] data, int offset, int len) {
synchronized(_fortuna) {
_fortuna.addRandomBytes(data, offset, len);
try {
synchronized(_fortuna) {
_fortuna.addRandomBytes(data, offset, len);
}
} catch (Exception e) {
// AIOOBE seen, root cause unknown, ticket #1576
Log log = _context.logManager().getLog(FortunaRandomSource.class);
log.warn("feedEntropy()", e);
}
}