Skip to content
Permalink
Browse files
Merge branch 'master' into scrR8
  • Loading branch information
tjwatson committed Jun 1, 2021
2 parents 2de0937 + 88c71ec commit e1b549051b706187ab0dd1fb94912cb5f70f7d38
Showing 139 changed files with 2,794 additions and 913 deletions.
@@ -33,13 +33,13 @@
<description>
Support for OSGi configurations specified in JSON documents.
</description>
<version>1.0.3-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>

<scm>
<connection>scm:git:https://github.com/apache/felix-dev.git</connection>
<developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=felix-dev.git;f=cm.json</url>
<tag>HEAD</tag>
<tag>org.apache.felix.cm.json-1.0.6</tag>
</scm>

<properties>
@@ -60,6 +60,14 @@
</Bundle-SymbolicName>
</instructions>
</configuration>
<executions>
<execution>
<id>baseline</id>
<goals>
<goal>baseline</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -72,7 +72,7 @@ public static Reader jsonCommentAwareReader(final Reader reader) throws IOExcept

/**
* Create a new map for configuration properties The returned map keeps the
* order of properties added.
* order of properties added and is using case-insensitive keys.
*
* @return A new map
*/
@@ -269,7 +269,11 @@ private Hashtable<String, Object> readSingleConfiguration(final String pid,
if ( keyInfo.isInternal ) {
final Object value = JsonSupport.convertToObject(propEntry.getValue());
if ( propertyHandler == null ) {
properties.put(keyInfo.propertyKey, value);
if ( properties.put(keyInfo.propertyKey, value) != null ) {
throwIOException("PID ".concat(pid)
.concat(" : Duplicate property (properties are case-insensitive) : ")
.concat(keyInfo.propertyKey));
}
} else {
propertyHandler.handleConfiguratorProperty(pid, keyInfo.propertyKey, value);
}
@@ -310,7 +314,11 @@ private Hashtable<String, Object> readSingleConfiguration(final String pid,
if ( convertedVal == null ) {
valid = false;
} else {
properties.put(keyInfo.propertyKey, convertedVal);
if ( properties.put(keyInfo.propertyKey, convertedVal) != null ) {
throwIOException("PID ".concat(pid)
.concat(" : Duplicate property (properties are case-insensitive) : ")
.concat(keyInfo.propertyKey));
}
}
}
}

0 comments on commit e1b5490

Please sign in to comment.