svn commit: r1484683 - /karaf/branches/karaf-2.2.x/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java

[ffang]

Author: ffang
Date: Tue May 21 07:44:09 2013
New Revision: 1484683

URL: http://svn.apache.org/r1484683
Log:
[KARAF-1973]NullPointerException when performing log:clear then log:tail in 
somecase

Modified:
    
karaf/branches/karaf-2.2.x/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java

Modified: 
karaf/branches/karaf-2.2.x/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java
URL: 
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java?rev=1484683&r1=1484682&r2=1484683&view=diff
==============================================================================
--- 
karaf/branches/karaf-2.2.x/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java
 (original)
+++ 
karaf/branches/karaf-2.2.x/shell/log/src/main/java/org/apache/karaf/shell/log/DisplayLog.java
 Tue May 21 07:44:09 2013
@@ -168,7 +168,7 @@ public class DisplayLog extends OsgiComm
 
     private String getColor(PaxLoggingEvent event) {
         String color = null;
-        if (!noColor) {
+        if (!noColor && event != null && event.getLevel() != null && 
event.getLevel().toString() != null) {
             String lvl = event.getLevel().toString().toLowerCase();
             if (FATAL.equals(lvl)) {
                 color = fatalColor;