commit 6f8220d5809b06ccc7a345f93d193064dfb105e8
author Anatole Tresch <atsticks@gmail.com> Tue May 14 17:13:53 2019 +0200
committer Anatole Tresch <atsticks@gmail.com> Tue May 14 17:13:53 2019 +0200
tree b42e2a9b39400d40bf925f7e7748a6dadb4a47ee
parent d216cae4db8f63169df9376f458a86dcbbbadd2e

Fixed reader issues.

metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java

diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java
index 3f628de..6238810 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java
@@ -57,11 +57,10 @@
                 continue;
             }
             ObjectValue ov = converterNode.toObjectValue();
-            if(ov.getPropertyValue("properties")==null){
-                LOG.severe("No property converter configured.");
-                continue;
+            ObjectValue propertyValue = null;
+            if(ov.getPropertyValue("properties")!=null){
+                propertyValue = ov.getPropertyValue("properties").toObjectValue();
             }
-            ObjectValue propertyValue = ov.getPropertyValue("properties").toObjectValue();
             Map<String,String> properties = propertyValue!=null? propertyValue.toLocalMap(): null;
             String type = ItemFactoryManager.getType(ov);
             if("defaults".equals(type)){

metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java

diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java
index 5c312ed..e8c1270 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java
@@ -62,7 +62,10 @@
                 continue;
             }
             ObjectValue ov = node.toObjectValue();
-            ObjectValue propertyValue = ov.getPropertyValue("properties").toObjectValue();
+            ObjectValue propertyValue = null;
+            if(ov.getPropertyValue("properties")!=null) {
+                propertyValue = ov.getPropertyValue("properties").toObjectValue();
+            }
             Map<String,String> params = propertyValue!=null? propertyValue.toLocalMap(): null;
             String type = ItemFactoryManager.getType(ov);
             if ("defaults".equals(type)) {