Repository: karaf Updated Branches: refs/heads/karaf-4.0.x 1e8a90586 -> 338582652
[KARAF-4299] NoSuchElementException when clearing history Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/33858265 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/33858265 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/33858265 Branch: refs/heads/karaf-4.0.x Commit: 33858265283019659056d717be68a8ac1418924b Parents: 1e8a905 Author: Andrea Cosentino <[email protected]> Authored: Sun Jan 31 11:42:20 2016 +0100 Committer: Andrea Cosentino <[email protected]> Committed: Sun Jan 31 12:06:17 2016 +0100 ---------------------------------------------------------------------- .../org/apache/karaf/shell/commands/impl/HistoryAction.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/33858265/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HistoryAction.java ---------------------------------------------------------------------- diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HistoryAction.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HistoryAction.java index 09ddeb1..d665a03 100644 --- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HistoryAction.java +++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/HistoryAction.java @@ -42,14 +42,17 @@ public class HistoryAction implements Action { if (history != null && clear) { history.clear(); } - for (int index = history.first(); index <= history.last(); index++) { - System.out.println( + + if (!clear) { + for (int index = history.first(); index <= history.last(); index++) { + System.out.println( Ansi.ansi() .a(" ") .a(Ansi.Attribute.INTENSITY_BOLD).render("%3d", index).a(Ansi.Attribute.INTENSITY_BOLD_OFF) .a(" ") .a(history.get(index)) .toString()); + } } return null; }
