infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-14 23:49:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

8026854: java.time.temporal.TemporalQueries doesn't compile after javac modification to lambda flow analysis

Browse Source 
Reviewed-by: psandoz
This commit is contained in:
Vicente Romero 2013-10-19 17:53:44 +01:00
parent d7f0eeb825
commit ac0dadca7f
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jdk/src/share/classes/java/time/temporal/TemporalQueries.java
View File

@ -341,33 +341,22 @@ public final class TemporalQueries {
/**
* A strict query for the {@code ZoneId}.
*/
static final TemporalQuery<ZoneId> ZONE_ID = (temporal) -> {
return temporal.query(ZONE_ID);
};
static final TemporalQuery<ZoneId> ZONE_ID = (temporal) ->
temporal.query(TemporalQueries.ZONE_ID);
/**
* A query for the {@code Chronology}.
*/
static final TemporalQuery<Chronology> CHRONO = (temporal) -> {
return temporal.query(CHRONO);
};
static final TemporalQuery<Chronology> CHRONO = (temporal) ->
temporal.query(TemporalQueries.CHRONO);
/**
* A query for the smallest supported unit.
*/
static final TemporalQuery<TemporalUnit> PRECISION = (temporal) -> {
return temporal.query(PRECISION);
};
static final TemporalQuery<TemporalUnit> PRECISION = (temporal) ->
temporal.query(TemporalQueries.PRECISION);
//-----------------------------------------------------------------------
/**
* A lenient query for the {@code ZoneId}, falling back to the {@code ZoneOffset}.
*/
static final TemporalQuery<ZoneId> ZONE = (temporal) -> {
ZoneId zone = temporal.query(ZONE_ID);
return (zone != null ? zone : temporal.query(OFFSET));
};
/**
* A query for {@code ZoneOffset} returning null if not found.
*/
@ -378,6 +367,14 @@ public final class TemporalQueries {
return null;
};
/**
* A lenient query for the {@code ZoneId}, falling back to the {@code ZoneOffset}.
*/
static final TemporalQuery<ZoneId> ZONE = (temporal) -> {
ZoneId zone = temporal.query(ZONE_ID);
return (zone != null ? zone : temporal.query(OFFSET));
};
/**
* A query for {@code LocalDate} returning null if not found.
*/