Fix for WFCORE-3225. CLI exception, keep calling stack

cli/src/main/java/org/jboss/as/cli/impl/CommandContextImpl.java

@@ -829,12 +829,7 @@ private <T> T execute(Callable<T> c, String msg) throws CommandLineException {
             Thread.currentThread().interrupt();
             throw new CommandLineException("Interrupt exception for " + msg);
         } catch (ExecutionException ex) {
-            Throwable cause = ex.getCause() == null ? ex : ex.getCause();
-            if (cause instanceof CommandLineException) {
-                throw (CommandLineException) cause;
-            }
-            throw new CommandLineException("Execution exception for " + msg
-                    + ": " + cause.getMessage(), cause);
+            throw new CommandLineException(ex);
         } catch (CommandLineException ex) {
             throw ex;
         } catch (Exception ex) {
@@ -846,7 +841,16 @@ public void handleSafe(String line) {
         exitCode = 0;
         try {
             handle(line);
-        } catch(Throwable t) {
+        } catch (Throwable t) {
+            // Remove exceptions that are wrappers to not pollute error message.
+            if (t instanceof CommandLineException
+                    && t.getCause() instanceof ExecutionException) {
+                // Get the ExecutionException cause.
+                Throwable cause = t.getCause().getCause();
+                if (cause != null) {
+                    t = cause;
+                }
+            }
             error(Util.getMessagesFromThrowable(t));
         }
     }

patching/src/test/java/org/jboss/as/patching/cli/ContentConflictsUnitTestCase.java

@@ -251,6 +251,7 @@ protected void assertConflicts(CommandLineException e, String... conflicts) {
                 buf.append(", ");
             }
         }
-        assertEquals(e.getMessage().split(System.getProperty("line.separator"))[0], buf.toString());
+        String msg = e.getMessage().substring(e.getMessage().indexOf(PatchLogger.ROOT_LOGGER.detectedConflicts()));
+        assertEquals(msg.split(System.getProperty("line.separator"))[0], buf.toString());
     }
 }