diff --git a/core/java/src/net/i2p/util/BufferedRandomSource.java b/core/java/src/net/i2p/util/BufferedRandomSource.java index b9760af91a775816fd49041583b4fe2f74f8eb1c..56b33390bc6ac9de878fc9d8df606d365252d9bb 100644 --- a/core/java/src/net/i2p/util/BufferedRandomSource.java +++ b/core/java/src/net/i2p/util/BufferedRandomSource.java @@ -204,6 +204,7 @@ public class BufferedRandomSource extends RandomSource { return super.nextGaussian(); } +/***** public static void main(String args[]) { for (int i = 0; i < 16; i++) test(); @@ -232,4 +233,5 @@ public class BufferedRandomSource extends RandomSource { } return buf.toString(); } +*****/ } diff --git a/core/java/src/net/i2p/util/PooledRandomSource.java b/core/java/src/net/i2p/util/PooledRandomSource.java index e0beb46f8d725054cf7d31f7083ac86e7d0ef4e9..71a929e7a8778d8a9724b5c4f57dbf77aad54fd8 100644 --- a/core/java/src/net/i2p/util/PooledRandomSource.java +++ b/core/java/src/net/i2p/util/PooledRandomSource.java @@ -196,6 +196,7 @@ public class PooledRandomSource extends RandomSource { return prng.harvester(); } +/***** public static void main(String args[]) { //PooledRandomSource prng = new PooledRandomSource(I2PAppContext.getGlobalContext()); long start = System.currentTimeMillis(); @@ -214,4 +215,5 @@ public class PooledRandomSource extends RandomSource { System.out.println("Written to random.file: create took " + (created-start) + ", generate took " + (done-created)); prng.saveSeed(); } +*****/ } diff --git a/core/java/src/net/i2p/util/RandomSource.java b/core/java/src/net/i2p/util/RandomSource.java index 100ec47d736c8406b5d23a968384216fa88c000e..c37c581dcb9d3ecbf6d0ea09f8bfd73cdd35845c 100644 --- a/core/java/src/net/i2p/util/RandomSource.java +++ b/core/java/src/net/i2p/util/RandomSource.java @@ -72,46 +72,30 @@ public class RandomSource extends SecureRandom implements EntropyHarvester { /** * override as synchronized, for those JVMs that don't always pull via * nextBytes (cough ibm) - */ + @Override public boolean nextBoolean() { return super.nextBoolean(); } - /** - * override as synchronized, for those JVMs that don't always pull via - * nextBytes (cough ibm) - */ + @Override public void nextBytes(byte buf[]) { super.nextBytes(buf); } - /** - * override as synchronized, for those JVMs that don't always pull via - * nextBytes (cough ibm) - */ + @Override public double nextDouble() { return super.nextDouble(); } - /** - * override as synchronized, for those JVMs that don't always pull via - * nextBytes (cough ibm) - */ + @Override public float nextFloat() { return super.nextFloat(); } - /** - * override as synchronized, for those JVMs that don't always pull via - * nextBytes (cough ibm) - */ + @Override public double nextGaussian() { return super.nextGaussian(); } - /** - * override as synchronized, for those JVMs that don't always pull via - * nextBytes (cough ibm) - */ + @Override public int nextInt() { return super.nextInt(); } - /** - * override as synchronized, for those JVMs that don't always pull via - * nextBytes (cough ibm) - */ + @Override public long nextLong() { return super.nextLong(); } - +*****/ + + /** */ public EntropyHarvester harvester() { return _entropyHarvester; } public void feedEntropy(String source, long data, int bitoffset, int bits) {