Author: markt
Date: Thu Mar 26 11:06:06 2009
New Revision: 758596
URL: http://svn.apache.org/viewvc?rev=758596&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46866
Better init of Random
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=758596&r1=758595&r2=758596&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Thu Mar 26
11:06:06 2009
@@ -420,7 +420,7 @@
int expected = 1024; // Cut off to avoid DoS attack
while (expected < shutdown.length()) {
if (random == null)
- random = new Random(System.currentTimeMillis());
+ random = new Random();
expected += (random.nextInt() % 1024);
}
while (expected > 0) {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java?rev=758596&r1=758595&r2=758596&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java Thu
Mar 26 11:06:06 2009
@@ -31,7 +31,7 @@
public static final int BITS_PER_BYTE = 8;
protected static SecureRandom secrand = null;
- protected static Random rand = new Random(System.currentTimeMillis());
+ protected static Random rand = new Random();
static {
secrand = new SecureRandom();
secrand.setSeed(rand.nextLong());
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java?rev=758596&r1=758595&r2=758596&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java Thu Mar 26
11:06:06 2009
@@ -251,7 +251,7 @@
public static class LoadMessage extends ByteMessage {
public static byte[] outdata = new byte[size];
- public static Random r = new Random(System.currentTimeMillis());
+ public static Random r = new Random();
public static int getMessageSize (LoadMessage msg) {
return msg.getMessage().length;
}
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java?rev=758596&r1=758595&r2=758596&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java Thu Mar 26
11:06:06 2009
@@ -399,7 +399,7 @@
dataModel.getValueAt(-1,-1);
}
- public static Random random = new Random(System.currentTimeMillis());
+ public static Random random = new Random();
public static String random(int count, int start, int end, boolean
letters, boolean numbers,
char[] chars ) {
if (count == 0) {
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java?rev=758596&r1=758595&r2=758596&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
Thu Mar 26 11:06:06 2009
@@ -166,7 +166,7 @@
public int length;
public byte[] data;
public byte key;
- public static Random r = new Random(System.currentTimeMillis());
+ public static Random r = new Random();
public static Data createRandomData() {
int i = r.nextInt();
i = ( i % 127 );
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java?rev=758596&r1=758595&r2=758596&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
Thu Mar 26 11:06:06 2009
@@ -198,7 +198,7 @@
public byte[] data;
public byte key;
public boolean hasNr = false;
- public static Random r = new Random(System.currentTimeMillis());
+ public static Random r = new Random();
public static Data createRandomData() {
return createRandomData(ChannelReceiver.MAX_UDP_SIZE);
}
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java?rev=758596&r1=758595&r2=758596&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
Thu Mar 26 11:06:06 2009
@@ -112,7 +112,7 @@
public byte[] data;
public byte key;
public boolean error = false;
- public static Random r = new Random(System.currentTimeMillis());
+ public static Random r = new Random();
public static Data createRandomData(boolean error) {
int i = r.nextInt();
i = ( i % 127 );
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java?rev=758596&r1=758595&r2=758596&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
Thu Mar 26 11:06:06 2009
@@ -240,7 +240,7 @@
public byte[] data;
public byte key;
public boolean hasNr = false;
- public static Random r = new Random(System.currentTimeMillis());
+ public static Random r = new Random();
public static Data createRandomData() {
return createRandomData(ChannelReceiver.MAX_UDP_SIZE);
}
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java?rev=758596&r1=758595&r2=758596&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
Thu Mar 26 11:06:06 2009
@@ -94,7 +94,7 @@
}
public static class TestMsg implements Serializable {
- static Random r = new Random(System.currentTimeMillis());
+ static Random r = new Random();
HashMap<Integer, ArrayList<Object>> map =
new HashMap<Integer, ArrayList<Object>>();
public TestMsg() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
