From 489e85723bd5687dc68a1cb3b4b892d91fcdfafd Mon Sep 17 00:00:00 2001
From: Jean-Francois Denise <jfdenise@gmail.com>
Date: Wed, 7 Jun 2017 11:59:40 +0200
Subject: [PATCH] Fix for WFCORE-2926. Disable error-on-interract for
 CLI.connect.

---
 .../java/org/jboss/as/cli/scriptsupport/CLI.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/cli/src/main/java/org/jboss/as/cli/scriptsupport/CLI.java b/cli/src/main/java/org/jboss/as/cli/scriptsupport/CLI.java
index cd3e1d4994f..a86661d8fc8 100644
--- a/cli/src/main/java/org/jboss/as/cli/scriptsupport/CLI.java
+++ b/cli/src/main/java/org/jboss/as/cli/scriptsupport/CLI.java
@@ -80,7 +80,10 @@ public CommandContext getCommandContext() {
      */
     public void connect() {
         doConnect(() -> {
-            return CommandContextFactory.getInstance().newCommandContext();
+            return CommandContextFactory.getInstance().
+                    newCommandContext(new CommandContextConfiguration.Builder()
+                    .setErrorOnInteract(false)
+                    .build());
         });
     }
 
@@ -93,7 +96,11 @@ public void connect() {
     public void connect(String username, char[] password) {
         doConnect(() -> {
             return CommandContextFactory.getInstance().
-                    newCommandContext(username, password);
+                    newCommandContext(new CommandContextConfiguration.Builder()
+                    .setUsername(username)
+                    .setPassword(password)
+                    .setErrorOnInteract(false)
+                    .build());
         });
     }
 
@@ -125,6 +132,7 @@ public void connect(String controller, String username, char[] password,
                             .setController(controller)
                     .setUsername(username)
                     .setPassword(password)
+                    .setErrorOnInteract(false)
                     .setClientBindAddress(clientBindAddress)
                     .build());
         });
@@ -190,6 +198,7 @@ public void connect(String protocol, String controllerHost, int controllerPort,
                             controllerPort))
                     .setUsername(username)
                     .setPassword(password)
+                    .setErrorOnInteract(false)
                     .setClientBindAddress(clientBindAddress)
                     .build());
         });