This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit cd10cfd51fdc80606b296a0cd71e6e9daf946438 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Thu Feb 24 06:33:25 2022 -0500 Make DurationUtils#getNanosOfMiili() null-safe. --- src/main/java/org/apache/commons/lang3/time/DurationUtils.java | 2 +- src/test/java/org/apache/commons/lang3/time/DurationUtilsTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/lang3/time/DurationUtils.java b/src/main/java/org/apache/commons/lang3/time/DurationUtils.java index 58d4358..139f85a 100644 --- a/src/main/java/org/apache/commons/lang3/time/DurationUtils.java +++ b/src/main/java/org/apache/commons/lang3/time/DurationUtils.java @@ -70,7 +70,7 @@ public class DurationUtils { * @return nanoseconds between 0 and 999,999. */ public static int getNanosOfMiili(final Duration duration) { - return duration.getNano() % 1_000_000; + return zeroIfNull(duration).getNano() % 1_000_000; } /** diff --git a/src/test/java/org/apache/commons/lang3/time/DurationUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DurationUtilsTest.java index 202ee4b..3b9c55b 100644 --- a/src/test/java/org/apache/commons/lang3/time/DurationUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/time/DurationUtilsTest.java @@ -34,6 +34,7 @@ public class DurationUtilsTest { @Test public void testGetNanosOfMilli() { + assertEquals(0, DurationUtils.getNanosOfMiili(null)); assertEquals(0, DurationUtils.getNanosOfMiili(Duration.ZERO)); assertEquals(1, DurationUtils.getNanosOfMiili(Duration.ofNanos(1))); assertEquals(10, DurationUtils.getNanosOfMiili(Duration.ofNanos(10)));