| commit | f259de34e853ff581005d10a31c14a958603aa51 | [log] [tgz] |
|---|---|---|
| author | Valentin Valchev <vvalchev@apache.org> | Tue Jul 22 07:58:52 2014 +0000 |
| committer | Valentin Valchev <vvalchev@apache.org> | Tue Jul 22 07:58:52 2014 +0000 |
| tree | 97ff081023714f0a10e1db604ce3ad7af0b6b4eb | |
| parent | 91dd974a26078e4ca797b5ebdb47b73506841c41 [diff] |
Fixed FELIX-4573 : Web Console Event plugin might cease operation if Event property is null https://issues.apache.org/jira/browse/FELIX-4573 git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1612498 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PluginServlet.java b/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PluginServlet.java index d7968c7..830b057 100644 --- a/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PluginServlet.java +++ b/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PluginServlet.java
@@ -356,7 +356,11 @@ first = false; jsonKey(jw, current.getKey().toString() ); final Object value = current.getValue(); - if ( value.getClass().isArray() ) + if ( null == value ) + { + jw.write("null"); //$NON-NLS-1$ + } + else if ( value.getClass().isArray() ) { // as we can't use 1.5 functionality we have to print the array ourselves final StringBuffer b = new StringBuffer("[");