Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 85894503a -> f5fecedf2
[KARAF-2773] Refreshing the console bundle closes karaf Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f5fecedf Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f5fecedf Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f5fecedf Branch: refs/heads/karaf-3.0.x Commit: f5fecedf2fab57447480ee524308d24df923849f Parents: 8589450 Author: Guillaume Nodet <[email protected]> Authored: Fri Feb 21 11:11:56 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Feb 21 19:39:20 2014 +0100 ---------------------------------------------------------------------- .../karaf/shell/console/impl/jline/ConsoleImpl.java | 12 ++++++++++-- .../karaf/shell/console/impl/jline/StreamWrapUtil.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/f5fecedf/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java ---------------------------------------------------------------------- diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java index 2ae105e..1396cc5 100644 --- a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java +++ b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java @@ -210,10 +210,18 @@ public class ConsoleImpl implements Console { ShellUtil.logException(session, t); } } - secCP.close(); + try { + secCP.close(); + } catch (Throwable t) { + // Ignore + } close(true); } finally { - threadIO.close(); + try { + threadIO.close(); + } catch (Throwable t) { + // Ignore + } } } http://git-wip-us.apache.org/repos/asf/karaf/blob/f5fecedf/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/StreamWrapUtil.java ---------------------------------------------------------------------- diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/StreamWrapUtil.java b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/StreamWrapUtil.java index c3c0623..f6aa549 100644 --- a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/StreamWrapUtil.java +++ b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/StreamWrapUtil.java @@ -80,7 +80,7 @@ final class StreamWrapUtil { static InputStream reWrapIn(Terminal terminal, InputStream stream) { try { - return terminal.wrapInIfNeeded(unwrapBIS(stream)); + return terminal.wrapInIfNeeded(unwrapBIS(unwrap(stream))); } catch (IOException e) { throw new RuntimeException(e); }
