commit 3e952ab52e103cdb61b1a59d4bdf0f36dd3cf934
author Felix Meschberger <fmeschbe@apache.org> Mon Sep 21 07:44:24 2009 +0000
committer Felix Meschberger <fmeschbe@apache.org> Mon Sep 21 07:44:24 2009 +0000
tree ca6847a69f0845df7eb8ce1a8474262a658e6f58
parent e60ec8af72ef40af27eec6dc06ece42cf937eebd

FELIX-1622 Prevent NullPointerException if no LogReaderService is
installed.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@817183 13f79535-47bb-0310-9956-ffa450edef68

webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java

diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java
index b5afd09..98bb6ce 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java
@@ -98,13 +98,17 @@
             jw.key( "data" );
             jw.array();
 
-            int index = 0;
-            for ( Enumeration logEntries = logReaderService.getLog(); logEntries.hasMoreElements() && index < MAX_LOGS; )
+            if ( logReaderService != null )
             {
-                LogEntry nextLog = ( LogEntry ) logEntries.nextElement();
-                if ( nextLog.getLevel() <= minLogLevel )
+                int index = 0;
+                for ( Enumeration logEntries = logReaderService.getLog(); logEntries.hasMoreElements()
+                    && index < MAX_LOGS; )
                 {
-                    logJson( jw, nextLog, index++ );
+                    LogEntry nextLog = ( LogEntry ) logEntries.nextElement();
+                    if ( nextLog.getLevel() <= minLogLevel )
+                    {
+                        logJson( jw, nextLog, index++ );
+                    }
                 }
             }