--- old/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalFactory.java	2015-07-02 08:23:19.865373309 -0700
+++ new/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/TerminalFactory.java	2015-07-02 08:23:19.719372354 -0700
@@ -163,12 +163,7 @@
     }
 
     public static Terminal getFlavor(final Flavor flavor) throws Exception {
-        Callable<? extends Terminal> sup = FLAVORS.get(flavor);
-        if (sup != null) {
-            return sup.call();
-        }
-
-        throw new InternalError();
+        return FLAVORS.getOrDefault(flavor, () -> {throw new InternalError();}).call();
     }
 
     public static void registerFlavor(final Flavor flavor, final Callable<? extends Terminal> sup) {