commit 9aaf91f88930685cd8e02500bd19507fd350aa22
author Felix Meschberger <fmeschbe@apache.org> Wed Mar 03 12:05:23 2010 +0000
committer Felix Meschberger <fmeschbe@apache.org> Wed Mar 03 12:05:23 2010 +0000
tree 6c594cdff210369285a3bfa0ea162236eaf04593
parent e42965fd1e3386ac87f3d67426883f4805da6e51

FELIX-2142 Apply patch by Valentin Valchev (thanks).

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

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

diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
index 5da4c13..5ae091e 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
@@ -503,7 +503,7 @@
             }
             catch ( Exception e )
             {
-                // add message
+                log( "Error reading configuration PID " + pid, e );
             }
         }
 
@@ -665,6 +665,16 @@
                         }
                         else if ( value.getClass().isArray() )
                         {
+                            if ( value.getClass().getComponentType().isPrimitive() ) 
+                            {
+                                final int len = Array.getLength(value);
+                                final Object[] tmp = new Object[len];
+                                for ( int j = 0; j < len; j++ )
+                                {
+                                    tmp[j] = Array.get(value, j);
+                                }
+                                value = tmp;
+                            }
                             value = new JSONArray( Arrays.asList( ( Object[] ) value ) );
                         }
                         else