diff --git a/log/command/src/main/java/org/apache/karaf/log/command/DisplayLog.java b/log/command/src/main/java/org/apache/karaf/log/command/DisplayLog.java index 8b2d753..7e5d88c 100644 --- a/log/command/src/main/java/org/apache/karaf/log/command/DisplayLog.java +++ b/log/command/src/main/java/org/apache/karaf/log/command/DisplayLog.java @@ -75,13 +75,17 @@ public class DisplayLog extends LogCommandSupport { final PrintStream out = System.out; Iterable le = logService.getEvents(entries == 0 ? Integer.MAX_VALUE : entries); - for (PaxLoggingEvent event : le) { - int sl = event.getLevel().getSyslogEquivalent(); - if (sl <= minLevel) { - printEvent(out, event); - } + while(le.hasNext()){ + try { + PaxLoggingEvent event = le.next(); + int sl = event.getLevel().getSyslogEquivalent(); + if (sl <= minLevel) { + printEvent(out, event); + } catch (NoClassDefFoundError e) { + // KARAF-3350: Ignore NoClassDefFoundError exceptions + // Those exceptions may happen if the underlying pax-logging service + // bundle has been refreshed somehow. } - out.println(); return null; } @@ -90,7 +94,6 @@ public class DisplayLog extends LogCommandSupport { } protected void printEvent(final PrintStream out, PaxLoggingEvent event) { - try { if ((logger != null) && (event != null) && (checkIfFromRequestedLog(event))) { @@ -98,10 +101,5 @@ public class DisplayLog extends LogCommandSupport { } else if ((event != null) && (logger == null)) { out.append(formatter.format(event, overridenPattern, noColor)); } - } catch (NoClassDefFoundError e) { - // KARAF-3350: Ignore NoClassDefFoundError exceptions - // Those exceptions may happen if the underlying pax-logging service - // bundle has been refreshed somehow. - } } }