[SDC] rebase 1710 code

[sdc.git] / catalog-model / src / main / java / org / openecomp / sdc / be / model / tosca / converters / ToscaMapValueConverter.java

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.java
index c40c59f..0673033 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaMapValueConverter.java
@@ -188,6 +188,9 @@ public class ToscaMapValueConverter extends ToscaValueBaseConverter implements T
        private Object convertDataTypeToToscaMap(String innerType, Map<String, DataTypeDefinition> dataTypes,
                        final boolean isScalarF, JsonElement entryValue) {
                Object convertedValue;
+               if (entryValue.isJsonPrimitive()) {
+                       return json2JavaPrimitive(entryValue.getAsJsonPrimitive());
+               } 
                JsonObject asJsonObjectIn = entryValue.getAsJsonObject();
 
                DataTypeDefinition dataTypeDefinition = dataTypes.get(innerType);