You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by vv...@apache.org on 2015/08/07 10:13:43 UTC
svn commit: r1694628 -
/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationSupport.java
Author: vvalchev
Date: Fri Aug 7 08:13:43 2015
New Revision: 1694628
URL: http://svn.apache.org/r1694628
Log:
Fixed FELIX-4995 : NPE when updating Apache Felix OSGi Management Console configuration without a password
https://issues.apache.org/jira/browse/FELIX-4995
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationSupport.java
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationSupport.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationSupport.java?rev=1694628&r1=1694627&r2=1694628&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationSupport.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationSupport.java Fri Aug 7 08:13:43 2015
@@ -19,7 +19,6 @@
package org.apache.felix.webconsole.internal.servlet;
-import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -104,9 +103,11 @@ class ConfigurationSupport implements Ma
Dictionary newConfig = cfg.getProperties();
if ( newConfig != null )
{
- // assumption: config is not null and as a non-null password String property
- final String pwd = ( String ) config.get( OsgiManager.PROP_PASSWORD );
- final String hashedPassword = Password.hashPassword( pwd );
+ String pwd = ( String ) config.get( OsgiManager.PROP_PASSWORD );
+ // password can be null, see FELIX-4995
+ final String hashedPassword = null == pwd
+ ? OsgiManager.DEFAULT_PASSWORD
+ : Password.hashPassword( pwd );
newConfig.put( OsgiManager.PROP_PASSWORD, hashedPassword );
cfg.update( newConfig );
}