ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/SplittableRandom.java
(Generate patch)

Comparing jsr166/src/main/java/util/SplittableRandom.java (file contents):
Revision 1.28 by jsr166, Sat Sep 19 21:07:10 2015 UTC vs.
Revision 1.37 by jsr166, Thu Nov 17 22:09:52 2016 UTC

# Line 219 | Line 219 | public final class SplittableRandom {
219          return seed += gamma;
220      }
221  
222 +    // IllegalArgumentException messages
223 +    static final String BAD_BOUND = "bound must be positive";
224 +    static final String BAD_RANGE = "bound must be greater than origin";
225 +    static final String BAD_SIZE  = "size must be non-negative";
226 +
227      /**
228       * The seed generator for default constructors.
229       */
230 <    private static final AtomicLong defaultGen = new AtomicLong(initialSeed());
231 <
232 <    private static long initialSeed() {
233 <        String pp = java.security.AccessController.doPrivileged(
234 <                new sun.security.action.GetPropertyAction(
235 <                        "java.util.secureRandomSeed"));
236 <        if (pp != null && pp.equalsIgnoreCase("true")) {
230 >    private static final AtomicLong defaultGen
231 >        = new AtomicLong(mix64(System.currentTimeMillis()) ^
232 >                         mix64(System.nanoTime()));
233 >
234 >    // at end of <clinit> to survive static initialization circularity
235 >    static {
236 >        if (java.security.AccessController.doPrivileged(
237 >            new java.security.PrivilegedAction<Boolean>() {
238 >                public Boolean run() {
239 >                    return Boolean.getBoolean("java.util.secureRandomSeed");
240 >                }})) {
241              byte[] seedBytes = java.security.SecureRandom.getSeed(8);
242 <            long s = (long)(seedBytes[0]) & 0xffL;
242 >            long s = (long)seedBytes[0] & 0xffL;
243              for (int i = 1; i < 8; ++i)
244 <                s = (s << 8) | ((long)(seedBytes[i]) & 0xffL);
245 <            return s;
244 >                s = (s << 8) | ((long)seedBytes[i] & 0xffL);
245 >            defaultGen.set(s);
246          }
238        return (mix64(System.currentTimeMillis()) ^
239                mix64(System.nanoTime()));
247      }
248  
242    // IllegalArgumentException messages
243    static final String BAD_BOUND = "bound must be positive";
244    static final String BAD_RANGE = "bound must be greater than origin";
245    static final String BAD_SIZE  = "size must be non-negative";
246
249      /*
250       * Internal versions of nextX methods used by streams, as well as
251       * the public nextX(origin, bound) methods.  These exist mainly to
# Line 825 | Line 827 | public final class SplittableRandom {
827       * approach. The long and double versions of this class are
828       * identical except for types.
829       */
830 <    static final class RandomIntsSpliterator implements Spliterator.OfInt {
830 >    private static final class RandomIntsSpliterator
831 >            implements Spliterator.OfInt {
832          final SplittableRandom rng;
833          long index;
834          final long fence;
# Line 880 | Line 883 | public final class SplittableRandom {
883      /**
884       * Spliterator for long streams.
885       */
886 <    static final class RandomLongsSpliterator implements Spliterator.OfLong {
886 >    private static final class RandomLongsSpliterator
887 >            implements Spliterator.OfLong {
888          final SplittableRandom rng;
889          long index;
890          final long fence;
# Line 936 | Line 940 | public final class SplittableRandom {
940      /**
941       * Spliterator for double streams.
942       */
943 <    static final class RandomDoublesSpliterator implements Spliterator.OfDouble {
943 >    private static final class RandomDoublesSpliterator
944 >            implements Spliterator.OfDouble {
945          final SplittableRandom rng;
946          long index;
947          final long fence;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines