From c8eee0d595ae86d794df3d4218085cb651a269bc Mon Sep 17 00:00:00 2001
From: vromero <unknown>
Date: Sat, 19 Oct 2013 17:53:44 +0100
Subject: [PATCH] 8026854: java.time.temporal.TemporalQueries doesn't compile
 after javac modification to lambda flow analysis Reviewed-by: psandoz

---
 .../java/time/temporal/TemporalQueries.java   | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/share/classes/java/time/temporal/TemporalQueries.java b/src/share/classes/java/time/temporal/TemporalQueries.java
index 42fd4ab62..6b1777a94 100644
--- a/src/share/classes/java/time/temporal/TemporalQueries.java
+++ b/src/share/classes/java/time/temporal/TemporalQueries.java
@@ -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.
      */
-- 
GitLab