felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1425431 - /felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
Date Sun, 23 Dec 2012 07:45:31 GMT
Author: fmeschbe
Date: Sun Dec 23 07:45:31 2012
New Revision: 1425431

URL: http://svn.apache.org/viewvc?rev=1425431&view=rev
Log:
FELIX3829 To no call toList to convert a non-existing value to a list. Instead just assume
an empty ArrayList

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=1425431&r1=1425430&r2=1425431&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
Sun Dec 23 07:45:31 2012
@@ -20,6 +20,7 @@ package org.apache.felix.webconsole.inte
 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 @@ public class ConfigManager extends Confi
 
     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] ) )



Mime
View raw message