NPE when building LineReader without explicit terminal, fixes #110

jline · Apr 11, 2017 · 70f1c96 · 70f1c96
1 parent ec945e1
commit 70f1c96
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/reader/src/main/java/org/jline/reader/LineReaderBuilder.java b/reader/src/main/java/org/jline/reader/LineReaderBuilder.java
@@ -8,12 +8,15 @@
  */
 package org.jline.reader;
 
+import java.io.IOError;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.jline.reader.impl.LineReaderImpl;
 import org.jline.reader.impl.history.DefaultHistory;
 import org.jline.terminal.Terminal;
+import org.jline.terminal.TerminalBuilder;
 
 public final class LineReaderBuilder {
 
@@ -87,6 +90,14 @@ public LineReaderBuilder expander(Expander expander) {
     }
 
     public LineReader build() {
+        Terminal terminal = this.terminal;
+        if (terminal == null) {
+            try {
+                terminal = TerminalBuilder.terminal();
+            } catch (IOException e) {
+                throw new IOError(e);
+            }
+        }
         LineReaderImpl reader = new LineReaderImpl(terminal, appName, variables);
         if (history != null) {
             reader.setHistory(history);

diff --git a/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -245,7 +245,7 @@ public LineReaderImpl(Terminal terminal, String appName) throws IOException {
     }
 
     public LineReaderImpl(Terminal terminal, String appName, Map<String, Object> variables) {
-        Objects.requireNonNull(terminal);
+        Objects.requireNonNull(terminal, "terminal can not be null");
         this.terminal = terminal;
         if (appName == null) {
             appName = "JLine";