1 files changed, 7 insertions, 11 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverter.java
index d8198dac6b..f3189ee968 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverter.java
@@ -109,19 +109,15 @@ public class ToscaListValueConverter extends ToscaValueBaseConverter implements
 			asJsonArray.forEach(e -> {
 				Object convertedValue = null;
 				if (isScalarF) {
-					String jsonAsString = e.toString();
-					log.debug("try to convert scalar value {}", jsonAsString);
-					if ( jsonAsString == null) {
-						convertedValue = null;
+					if (e.isJsonPrimitive()) {
+						String jsonAsString = e.getAsString();
+						log.debug("try to convert scalar value {}", jsonAsString);
+						convertedValue = innerConverterFinal.convertToToscaValue(jsonAsString, innerType,
+								dataTypes);
 					} else {
-						JsonElement singleElement = jsonParser.parse(jsonAsString);
-						if (singleElement.isJsonPrimitive()) {
-							convertedValue = innerConverterFinal.convertToToscaValue(jsonAsString, innerType,
-									dataTypes);
-						} else {
-							convertedValue = handleComplexJsonValue(singleElement);
-						}
+						convertedValue = handleComplexJsonValue(e);
 					}
+
 				} else {
 					JsonObject asJsonObject = e.getAsJsonObject();
 					Set<Entry<String, JsonElement>> entrySet = asJsonObject.entrySet();