From: zhaoxiangjun666 <xjzhaop@isoftstone.com>
Date: Tue, 17 Nov 2020 03:11:32 +0000 (+0800)
Subject: When submitting the service CSAR file import, duplicate key null appears in the log
X-Git-Tag: 1.7.3~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F114958%2F2;p=sdc.git

When submitting the service CSAR file import, duplicate key null appears in the log

Issue-ID: SDC-3382
Change-Id: I7679cd7677f9e9bb6e7c8efd8f081fba4972d1bd
Signed-off-by: zhaoxiangjun666 <xjzhaop@isoftstone.com>
---

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
index 4d2480f6af..0d9e6a0fc9 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
@@ -1874,7 +1874,7 @@ public class ModelConverter {
                 attributesMap = new MapAttributesDataDefinition();
 
                 attributesMap.setMapToscaDataDefinition(entry.getValue().stream().map(AttributeDefinition::new)
-                    .collect(Collectors.toMap(AttributeDataDefinition::getName, Function.identity())));
+                    .collect(Collectors.toMap(AttributeDataDefinition::getName, Function.identity(),(entity1,entity2) -> entity1)));
 
                 topologyTemplate.getInstAttributes().put(entry.getKey(), attributesMap);
             }