summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhaoxiangjun666 <xjzhaop@isoftstone.com>2020-11-17 11:11:32 +0800
committerChristophe Closset <christophe.closset@intl.att.com>2020-11-17 13:18:00 +0000
commit8adf8aa4772b282133e053a21fc8de65973d37e5 (patch)
tree0f9b86f72175328f7839a1db55750fd464bdc6d7
parent10fadf829ddd02bf9e0da6f58ad728611e650101 (diff)
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>
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java2
1 files changed, 1 insertions, 1 deletions
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);
}