felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vvalc...@apache.org
Subject svn commit: r1701008 - /felix/trunk/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PluginServlet.java
Date Thu, 03 Sep 2015 13:10:56 GMT
Author: vvalchev
Date: Thu Sep  3 13:10:56 2015
New Revision: 1701008

URL: http://svn.apache.org/r1701008
Log:
Fixed FELIX-5025 : NPE in Events web console plugin - no events can be seen
https://issues.apache.org/jira/browse/FELIX-5025

Modified:
    felix/trunk/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PluginServlet.java

Modified: felix/trunk/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PluginServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PluginServlet.java?rev=1701008&r1=1701007&r2=1701008&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PluginServlet.java
(original)
+++ felix/trunk/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PluginServlet.java
Thu Sep  3 13:10:56 2015
@@ -23,11 +23,17 @@ import java.io.InputStream;
 import java.io.PrintWriter;
 import java.lang.reflect.Array;
 import java.net.URL;
-import java.util.*;
+import java.util.Date;
+import java.util.Dictionary;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;
@@ -358,7 +364,7 @@ public class PluginServlet extends HttpS
                 final Object value = current.getValue();
                 if ( null == value )
                 {
-                  jw.write("null"); //$NON-NLS-1$
+                  jw.write( "null" ); //$NON-NLS-1$
                 }
                 else if ( value.getClass().isArray() )
                 {
@@ -370,7 +376,7 @@ public class PluginServlet extends HttpS
                         {
                             b.append(", ");
                         }
-                        b.append( Array.get(value, m).toString() );
+                        b.append( String.valueOf( Array.get(value, m) ) );
                     }
                     b.append(']');
                     jsonValue(jw, b.toString());



Mime
View raw message