--- a/jdk/src/java.base/share/classes/java/time/ZoneId.java	Wed Nov 11 09:19:12 2015 +0000
+++ b/jdk/src/java.base/share/classes/java/time/ZoneId.java	Wed Nov 11 22:38:15 2015 -0500
@@ -310,8 +310,7 @@
     public static ZoneId of(String zoneId, Map<String, String> aliasMap) {
         Objects.requireNonNull(zoneId, "zoneId");
         Objects.requireNonNull(aliasMap, "aliasMap");
-        String id = aliasMap.get(zoneId);
-        id = (id != null ? id : zoneId);
+        String id = Objects.requireNonNullElse(aliasMap.get(zoneId), zoneId);
         return of(id);
     }