You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/03/30 17:02:44 UTC
svn commit: r1086979 -
/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java
Author: iocanel
Date: Wed Mar 30 15:02:43 2011
New Revision: 1086979
URL: http://svn.apache.org/viewvc?rev=1086979&view=rev
Log:
[KARAF-546] Added NPE check inside DisplaLog.
Modified:
karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java
Modified: karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java?rev=1086979&r1=1086978&r2=1086979&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java (original)
+++ karaf/trunk/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java Wed Mar 30 15:02:43 2011
@@ -131,7 +131,9 @@ public class DisplayLog extends OsgiComm
Iterable<PaxLoggingEvent> le = events.getElements(entries == 0 ? Integer.MAX_VALUE : entries);
for (PaxLoggingEvent event : le) {
- display(cnv, event, out);
+ if (event != null) {
+ display(cnv, event, out);
+ }
}
out.println();
return null;