You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2013/10/28 18:10:16 UTC

svn commit: r1536422 - /karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java

Author: janstey
Date: Mon Oct 28 17:10:16 2013
New Revision: 1536422

URL: http://svn.apache.org/r1536422
Log:
KARAF-2531 - NPE in log:tail after a log:clear

Modified:
    karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java

Modified: karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java
URL: http://svn.apache.org/viewvc/karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java?rev=1536422&r1=1536421&r2=1536422&view=diff
==============================================================================
--- karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java (original)
+++ karaf/trunk/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java Mon Oct 28 17:10:16 2013
@@ -70,7 +70,9 @@ public class LogTail extends DisplayLog 
         public void run() {
             Iterable<PaxLoggingEvent> le = logService.getEvents(entries == 0 ? Integer.MAX_VALUE : entries);
             for (PaxLoggingEvent event : le) {
-                printEvent(out, event);
+                if (event != null) {
+                    printEvent(out, event);
+                }
             }
             // Tail
             final BlockingQueue<PaxLoggingEvent> queue = new LinkedBlockingQueue<PaxLoggingEvent>();