You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2010/03/03 13:05:23 UTC
svn commit: r918434 -
/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
Author: fmeschbe
Date: Wed Mar 3 12:05:23 2010
New Revision: 918434
URL: http://svn.apache.org/viewvc?rev=918434&view=rev
Log:
FELIX-2142 Apply patch by Valentin Valchev (thanks).
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java?rev=918434&r1=918433&r2=918434&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java Wed Mar 3 12:05:23 2010
@@ -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