[WFLY-1865]

fixed possible nullpointer and updated aesh version that should fix: https://bugzilla.redhat.com/show_bug.cgi?id=996164
wildfly · Aug 13, 2013 · c00d469 · c00d469
1 parent 9d184cd
commit c00d469
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cli/src/main/java/org/jboss/as/cli/impl/Console.java b/cli/src/main/java/org/jboss/as/cli/impl/Console.java
@@ -28,6 +28,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.jboss.aesh.console.ConsoleOutput;
 import org.jboss.as.cli.CliInitializationException;
 import org.jboss.as.cli.CommandContext;
 import org.jboss.as.cli.CommandHistory;
@@ -174,7 +175,8 @@ public void printNewLine() {
                 @Override
                 public String readLine(String prompt) {
                     try {
-                        return console.read(prompt).getBuffer();
+                        ConsoleOutput output = console.read(prompt);
+                        return output != null ? output.getBuffer() : null;
                     } catch (IOException e) {
                         e.printStackTrace();
                         return null;

diff --git a/pom.xml b/pom.xml
@@ -155,7 +155,7 @@
         <version.org.jacorb>2.3.2.jbossorg-4</version.org.jacorb>
         <version.org.javassist>3.18.1-Beta1</version.org.javassist>
         <version.org.jdom>1.1.2</version.org.jdom>
-        <version.org.jboss.aesh>0.33.7</version.org.jboss.aesh>
+        <version.org.jboss.aesh>0.33.8</version.org.jboss.aesh>
         <version.org.jboss.arquillian.core>1.0.3.Final</version.org.jboss.arquillian.core>
         <version.org.jboss.arquillian.osgi>2.0.0.CR3</version.org.jboss.arquillian.osgi>
         <version.org.jboss.as.console>2.0.0.Beta2</version.org.jboss.as.console>