Repository: commons-math Updated Branches: refs/heads/master dcd8015fa -> 3e5c248f7
Allow zero-length fill (i.e. no-op call). Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/fdc116f0 Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/fdc116f0 Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/fdc116f0 Branch: refs/heads/master Commit: fdc116f0bcda6d1fffbbe505d0687b0406e92fa6 Parents: 2fcfce3 Author: Gilles <er...@apache.org> Authored: Thu Dec 31 23:55:47 2015 +0100 Committer: Gilles <er...@apache.org> Committed: Thu Dec 31 23:56:59 2015 +0100 ---------------------------------------------------------------------- .../apache/commons/math4/random/BaseRandomGenerator.java | 9 ++++----- .../commons/math4/random/BaseRandomGeneratorTest.java | 7 ------- 2 files changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/fdc116f0/src/main/java/org/apache/commons/math4/random/BaseRandomGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/BaseRandomGenerator.java b/src/main/java/org/apache/commons/math4/random/BaseRandomGenerator.java index bc6442e..9907d71 100644 --- a/src/main/java/org/apache/commons/math4/random/BaseRandomGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/BaseRandomGenerator.java @@ -200,7 +200,7 @@ public abstract class BaseRandomGenerator * @param start Index at which to start inserting the generated bytes. * @param len Number of bytes to insert. * @throws OutOfRangeException if {@code start < 0} or {@code start >= bytes.length}. - * @throws OutOfRangeException if {@code len <= 0} or {@code len > bytes.length - start}. + * @throws OutOfRangeException if {@code len < 0} or {@code len > bytes.length - start}. */ public void nextBytes(byte[] bytes, int start, @@ -209,10 +209,9 @@ public abstract class BaseRandomGenerator start >= bytes.length) { throw new OutOfRangeException(start, 0, bytes.length); } - final int max = bytes.length - start; - if (len <= 0 || - len > max) { - throw new OutOfRangeException(len, 0, max); + if (len < 0 || + len > bytes.length - start) { + throw new OutOfRangeException(len, 0, bytes.length - start); } nextBytesFill(bytes, start, len); http://git-wip-us.apache.org/repos/asf/commons-math/blob/fdc116f0/src/test/java/org/apache/commons/math4/random/BaseRandomGeneratorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/random/BaseRandomGeneratorTest.java b/src/test/java/org/apache/commons/math4/random/BaseRandomGeneratorTest.java index 40ab9b5..13b83ee 100644 --- a/src/test/java/org/apache/commons/math4/random/BaseRandomGeneratorTest.java +++ b/src/test/java/org/apache/commons/math4/random/BaseRandomGeneratorTest.java @@ -63,13 +63,6 @@ public class BaseRandomGeneratorTest extends RandomGeneratorAbstractTest { public void testNextBytesPrecondition3() { final int len = 3; final byte[] b = new byte[len]; - baseRandomGenerator.nextBytes(b, 0, 0); - } - - @Test(expected=OutOfRangeException.class) - public void testNextBytesPrecondition4() { - final int len = 3; - final byte[] b = new byte[len]; baseRandomGenerator.nextBytes(b, 0, len + 1); }
