Merge pull request #1488 from aloubyansky/WFCORE-1315-cli-double-prompt

[WFCORE-1315] CLI Double prompt when connecting to a new HC
wildfly · Apr 6, 2016 · 64f185a · 64f185a
2 parents 9321953 + ce99f29
commit 64f185a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/cli/src/main/java/org/jboss/as/cli/impl/CommandContextImpl.java b/cli/src/main/java/org/jboss/as/cli/impl/CommandContextImpl.java
@@ -1055,8 +1055,7 @@ public void bindClient(ModelControllerClient newClient) {
         initNewClient(newClient, null, null);
     }
 
-    private void initNewClient(ModelControllerClient newClient, ControllerAddress address,
-            ConnectionInfoBean conInfo) {
+    private void initNewClient(ModelControllerClient newClient, ControllerAddress address, ConnectionInfoBean conInfo) {
         if (newClient != null) {
             if (this.client != null) {
                 disconnectController();
@@ -1461,10 +1460,10 @@ public void interact() {
                     + " 'help' for the list of supported commands.");
         }
 
-        console.setPrompt(getPrompt());
         if(!console.running()) {
             console.start();
         }
+        console.setPrompt(getPrompt());
         if(console.isControlled()) {
             console.continuous();
         }

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
@@ -222,15 +222,15 @@ private String read(String prompt, Character mask) {
                         Prompt origPrompt = null;
                         if(!console.getPrompt().getPromptAsString().equals(prompt)) {
                             origPrompt = console.getPrompt();
-                            console.setPrompt(new Prompt(prompt, mask));
+                            console.updatePrompt(new Prompt(prompt, mask));
                         }
                         try {
                             return console.getInputLine();
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                         } finally {
                             if(origPrompt != null) {
-                                console.setPrompt(origPrompt);
+                                console.updatePrompt(origPrompt);
                             }
                         }
                     } finally {
@@ -310,8 +310,10 @@ public void setPrompt(String prompt){
 
                 @Override
                 public void
-                setPrompt(String prompt, Character mask){
-                    console.setPrompt(new Prompt(prompt, mask));
+                setPrompt(String prompt, Character mask) {
+                    if(!prompt.equals(console.getPrompt().getPromptAsString())) {
+                        console.updatePrompt(new Prompt(prompt, mask));
+                    }
                 }
 
                 class HistoryImpl implements CommandHistory {

diff --git a/pom.xml b/pom.xml
@@ -94,7 +94,7 @@
         <version.org.codehaus.woodstox.stax2-api>3.1.4</version.org.codehaus.woodstox.stax2-api>
         <version.org.codehaus.woodstox.woodstox-core-asl>4.4.1</version.org.codehaus.woodstox.woodstox-core-asl>
         <version.org.fusesource.jansi>1.11</version.org.fusesource.jansi>
-        <version.org.jboss.aesh>0.66.4</version.org.jboss.aesh>
+        <version.org.jboss.aesh>0.66.8</version.org.jboss.aesh>
         <version.org.jboss.byteman>3.0.3</version.org.jboss.byteman>
         <version.org.jboss.classfilewriter>1.1.2.Final</version.org.jboss.classfilewriter>
         <version.org.jboss.invocation>1.4.1.Final</version.org.jboss.invocation>