You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2013/07/25 11:04:34 UTC
svn commit: r1506852 -
/karaf/branches/karaf-2.3.x/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java
Author: ffang
Date: Thu Jul 25 09:04:34 2013
New Revision: 1506852
URL: http://svn.apache.org/r1506852
Log:
[KARAF-1593]add a NPE guard for log event
Modified:
karaf/branches/karaf-2.3.x/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java
Modified: karaf/branches/karaf-2.3.x/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java?rev=1506852&r1=1506851&r2=1506852&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java (original)
+++ karaf/branches/karaf-2.3.x/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java Thu Jul 25 09:04:34 2013
@@ -64,7 +64,10 @@ public class LogTail extends DisplayLog
try {
events.addAppender(appender);
while (!needEndLog) {
- display(cnv, queue.take(), out);
+ PaxLoggingEvent logEvent = queue.take();
+ if (logEvent != null) {
+ display(cnv, logEvent, out);
+ }
}
} catch (InterruptedException e) {
// Ignore