Skip to content

Commit 5e5f390

Browse files
ummelsnicolasstucki
authored andcommitted
Fix #1967: LocalTime.isSupported should return false for null
1 parent d8e8156 commit 5e5f390

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

src/main/scala/java/time/LocalTime.scala

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,14 @@ final class LocalTime private (hour: Int, minute: Int, second: Int, nano: Int)
2323
requireDateTime(nano >= 0 && nano <= 999999999, s"Invalid value for nanoOfSecond $nano")
2424

2525
def isSupported(field: TemporalField): Boolean = field match {
26-
case NANO_OF_SECOND | NANO_OF_DAY | MICRO_OF_SECOND | MICRO_OF_DAY |
27-
MILLI_OF_SECOND | MILLI_OF_DAY | SECOND_OF_MINUTE | SECOND_OF_DAY |
28-
MINUTE_OF_HOUR | MINUTE_OF_DAY | HOUR_OF_AMPM | CLOCK_HOUR_OF_AMPM |
29-
HOUR_OF_DAY | CLOCK_HOUR_OF_DAY | AMPM_OF_DAY =>
30-
true
31-
32-
case _: ChronoField => false
26+
case _: ChronoField => field.isTimeBased
27+
case null => false
3328
case _ => field.isSupportedBy(this)
3429
}
3530

3631
def isSupported(unit: TemporalUnit): Boolean = unit match {
37-
case NANOS | MICROS | MILLIS | SECONDS | MINUTES | HOURS | HALF_DAYS => true
38-
39-
case _: ChronoUnit => false
32+
case _: ChronoUnit => unit.isTimeBased
33+
case null => false
4034
case _ => unit.isSupportedBy(this)
4135
}
4236

0 commit comments

Comments
 (0)