[karaf] branch master updated: [KARAF-5842] Console unusable in docker

[gn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 04b0d91  [KARAF-5842] Console unusable in docker
04b0d91 is described below

commit 04b0d916f3842b19d0f0cdd8f2d3ea40f622405d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Jul 17 14:18:23 2018 +0200

    [KARAF-5842] Console unusable in docker
---
 .../java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
index b4409fd..0f11f65 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
@@ -67,6 +67,7 @@ import org.apache.karaf.shell.support.completers.UriCompleter;
 import org.apache.karaf.util.filesstream.FilesStream;
 import org.jline.builtins.Completers;
 import org.jline.reader.*;
+import org.jline.terminal.Size;
 import org.jline.terminal.Terminal.Signal;
 import org.jline.terminal.impl.DumbTerminal;
 import org.osgi.service.event.EventAdmin;
@@ -146,6 +147,10 @@ public class ConsoleSessionImpl implements Session {
             }
         }
 
+        if (jlineTerminal.getSize().getColumns() == 0) {
+            jlineTerminal.setSize(new Size(80, 24));
+        }
+
         brandingProps = Branding.loadBrandingProperties(terminal.getClass().getName().endsWith("SshTerminal"));
 
         // Create session