Merge remote-tracking branch 'origin/GT-3460_ryanmkurtz_dividezero'

This commit is contained in:
ghidorahrex
2020-01-16 14:01:05 -05:00
2 changed files with 2 additions and 1 deletions
@@ -250,7 +250,7 @@ public final class NumericUtilities {
* @return aligned value * @return aligned value
*/ */
public static long getUnsignedAlignedValue(long unsignedValue, long alignment) { public static long getUnsignedAlignedValue(long unsignedValue, long alignment) {
if (unsignedValue % alignment == 0) { if (alignment == 0 || unsignedValue % alignment == 0) {
return unsignedValue; return unsignedValue;
} }
boolean negative = unsignedValue < 0; boolean negative = unsignedValue < 0;
@@ -310,6 +310,7 @@ public class NumericUtilitiesTest {
assertEquals(0, NumericUtilities.getUnsignedAlignedValue(0, 5)); assertEquals(0, NumericUtilities.getUnsignedAlignedValue(0, 5));
assertEquals(5, NumericUtilities.getUnsignedAlignedValue(3, 5)); assertEquals(5, NumericUtilities.getUnsignedAlignedValue(3, 5));
assertEquals(0xa, NumericUtilities.getUnsignedAlignedValue(8, 5)); assertEquals(0xa, NumericUtilities.getUnsignedAlignedValue(8, 5));
assertEquals(0xa, NumericUtilities.getUnsignedAlignedValue(0xa, 0));
} }