Merge pull request #865 from jamesrdf/issues/#864-console-eof

James Leigh · web-flow · commit 351f42f93af0 · 2017-07-24T11:19:11.000-04:00
Fix #864: Check for null input on console
diff --git a/core/console/src/main/java/org/eclipse/rdf4j/console/ConsoleIO.java b/core/console/src/main/java/org/eclipse/rdf4j/console/ConsoleIO.java
@@ -53,7 +53,11 @@ protected String readCommand()
 			}
 			write("> ");
 		}
-		String line = input.readLine().trim();
+		String line = input.readLine();
+		if (line == null) {
+			return null;
+		}
+		line = line.trim();
 		if (line.endsWith(".")) {
 			line = line.substring(0, line.length() - 1);
 		}

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,11 @@ protected String readCommand()`
`53`	`53`	`}`
`54`	`54`	`write("> ");`
`55`	`55`	`}`
`56`		`- String line = input.readLine().trim();`
	`56`	`+ String line = input.readLine();`
	`57`	`+ if (line == null) {`
	`58`	`+ return null;`
	`59`	`+ }`
	`60`	`+ line = line.trim();`
`57`	`61`	`if (line.endsWith(".")) {`
`58`	`62`	`line = line.substring(0, line.length() - 1);`
`59`	`63`	`}`