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 2020/04/15 10:00:43 UTC
[felix-dev] branch master updated: Fix configuration writing and
collection handling
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 029a06e Fix configuration writing and collection handling
029a06e is described below
commit 029a06ec1b51754b34bfbe4c7eef5629a9249c92
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Apr 15 12:00:28 2020 +0200
Fix configuration writing and collection handling
---
.../org/apache/felix/cm/json/ConfigurationResource.java | 2 +-
.../felix/cm/json/impl/ConfigurationWriterImpl.java | 3 ++-
.../org/apache/felix/cm/json/impl/TypeConverter.java | 16 ++++++++--------
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationResource.java b/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationResource.java
index ac151b3..0b254a7 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationResource.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationResource.java
@@ -43,7 +43,7 @@ public final class ConfigurationResource {
/**
* The properties of the resource
- * @return A map pf properties
+ * @return A map of properties
*/
public Map<String, Object> getProperties() {
return properties;
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationWriterImpl.java b/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationWriterImpl.java
index a643e6a..f54703e 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationWriterImpl.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationWriterImpl.java
@@ -73,6 +73,7 @@ public class ConfigurationWriterImpl
public void writeConfiguration(final Dictionary<String, Object> properties) throws IOException {
checkClosed();
writeConfigurationInternal(properties);
+ this.generator.close();
}
private void writeConfigurationInternal(final Dictionary<String, Object> properties) throws IOException {
@@ -106,6 +107,6 @@ public class ConfigurationWriterImpl
writeConfigurationInternal(entry.getValue());
}
generator.writeEnd();
-
+ this.generator.close();
}
}
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/impl/TypeConverter.java b/cm.json/src/main/java/org/apache/felix/cm/json/impl/TypeConverter.java
index 1769ae9..7d09e4a 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/impl/TypeConverter.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/json/impl/TypeConverter.java
@@ -50,22 +50,22 @@ public class TypeConverter {
static {
// scalar types and primitive types
TYPE_MAP.put("String", String.class);
- TYPE_MAP.put("int", Integer.class);
TYPE_MAP.put("Integer", Integer.class);
- TYPE_MAP.put("long", Long.class);
+ TYPE_MAP.put("int", Integer.class);
TYPE_MAP.put("Long", Long.class);
- TYPE_MAP.put("float", Float.class);
+ TYPE_MAP.put("long", Long.class);
TYPE_MAP.put("Float", Float.class);
- TYPE_MAP.put("double", Double.class);
+ TYPE_MAP.put("float", Float.class);
TYPE_MAP.put("Double", Double.class);
- TYPE_MAP.put("byte", Byte.class);
+ TYPE_MAP.put("double", Double.class);
TYPE_MAP.put("Byte", Byte.class);
- TYPE_MAP.put("short", Short.class);
+ TYPE_MAP.put("byte", Byte.class);
TYPE_MAP.put("Short", Short.class);
- TYPE_MAP.put("char", Character.class);
+ TYPE_MAP.put("short", Short.class);
TYPE_MAP.put("Character", Character.class);
- TYPE_MAP.put("boolean", Boolean.class);
+ TYPE_MAP.put("char", Character.class);
TYPE_MAP.put("Boolean", Boolean.class);
+ TYPE_MAP.put("boolean", Boolean.class);
// array of scalar types and primitive types
TYPE_MAP.put("String[]", String[].class);
TYPE_MAP.put("int[]", int[].class);