FELIX3829 To no call toList to convert a non-existing value to a list. Instead just assume an empty ArrayList
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1425431 13f79535-47bb-0310-9956-ffa450edef68
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 bc5b98c..1ee69f4 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
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.lang.reflect.Array;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -1206,7 +1207,7 @@
private static void setPasswordProps( final Vector vec, final String[] properties, Object props )
{
- List propList = toList( props );
+ List propList = ( props == null ) ? new ArrayList() : toList( props );
for ( int i = 0; i < properties.length; i++ )
{
if ( PASSWORD_PLACEHOLDER_VALUE.equals( properties[i] ) )