You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2018/01/19 09:44:55 UTC
svn commit: r1821609 - in
/felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl:
Configurator.java json/JSONUtil.java
Author: cziegeler
Date: Fri Jan 19 09:44:54 2018
New Revision: 1821609
URL: http://svn.apache.org/viewvc?rev=1821609&view=rev
Log:
Fix NPE for initial configurations and ignore internal properties
Modified:
felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/Configurator.java
felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java
Modified: felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/Configurator.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/Configurator.java?rev=1821609&r1=1821608&r2=1821609&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/Configurator.java (original)
+++ felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/Configurator.java Fri Jan 19 09:44:54 2018
@@ -35,6 +35,7 @@ import java.util.TreeMap;
import org.apache.felix.configurator.impl.json.BinUtil;
import org.apache.felix.configurator.impl.json.JSONUtil;
+import org.apache.felix.configurator.impl.json.TypeConverter;
import org.apache.felix.configurator.impl.logger.SystemLogger;
import org.apache.felix.configurator.impl.model.BundleState;
import org.apache.felix.configurator.impl.model.Config;
@@ -253,10 +254,11 @@ public class Configurator {
if ( state.getInitialHashes() != null ) {
processRemoveBundle(-1);
}
+ final TypeConverter converter = new TypeConverter(null);
final JSONUtil.Report report = new JSONUtil.Report();
final List<ConfigurationFile> allFiles = new ArrayList<>();
for(final Map.Entry<String, String> entry : files.entrySet()) {
- final ConfigurationFile file = org.apache.felix.configurator.impl.json.JSONUtil.readJSON(null, entry.getKey(), null, -1, entry.getValue(), report);
+ final ConfigurationFile file = org.apache.felix.configurator.impl.json.JSONUtil.readJSON(converter, entry.getKey(), null, -1, entry.getValue(), report);
if ( file != null ) {
allFiles.add(file);
}
Modified: felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java?rev=1821609&r1=1821608&r2=1821609&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java (original)
+++ felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java Fri Jan 19 09:44:54 2018
@@ -190,7 +190,9 @@ public class JSONUtil {
final List<Config> configurations = new ArrayList<>();
for(final Map.Entry<String, ?> entry : configs.entrySet()) {
if ( ! (entry.getValue() instanceof Map) ) {
- report.errors.add("Ignoring configuration in '" + identifier + "' (not a configuration) : " + entry.getKey());
+ if ( !entry.getKey().startsWith(INTERNAL_PREFIX) ) {
+ report.errors.add("Ignoring configuration in '" + identifier + "' (not a configuration) : " + entry.getKey());
+ }
} else {
@SuppressWarnings("unchecked")
final Map<String, ?> mainMap = (Map<String, ?>)entry.getValue();