Fix possible NPE in LineDisciplineTerminal#processInputByte caused by…

… non atomic call to EnumMap#getOrDefault, fixes #145
jline · Jul 10, 2017 · ddd7415 · ddd7415
1 parent 53b2d52
commit ddd7415
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/terminal/src/main/java/org/jline/terminal/Attributes.java b/terminal/src/main/java/org/jline/terminal/Attributes.java
@@ -288,7 +288,8 @@ public void setControlChars(EnumMap<ControlChar, Integer> chars) {
     }
 
     public int getControlChar(ControlChar c) {
-        return cchars.getOrDefault(c, -1);
+        Integer v = cchars.get(c);
+        return v != null ? v : -1;
     }
 
     public void setControlChar(ControlChar c, int value) {