From: KrupaNagabhushan Date: Mon, 22 Jun 2020 11:55:04 +0000 (+0100) Subject: Fix for name clash in csar generation X-Git-Tag: 1.7.0~29 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b95aa52a9f57ec6c4d53376fc59c749621f541f9;p=sdc.git Fix for name clash in csar generation Issue-ID: SDC-3144 Change-Id: Ia9b66bb14bbff3add70eed8dfe41acc55c72b35b Signed-off-by: KrupaNagabhushan --- diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java index f479bb5c0f..6e3019c0c3 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java @@ -1389,8 +1389,12 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { final String nameWithouNamespacePrefix = nodeTypefullName.substring(nodeTypeNamePrefix.length()); final String[] findTypes = nameWithouNamespacePrefix.split("\\."); - final String resourceType = findTypes[0]; - return nameWithouNamespacePrefix.substring(resourceType.length()); + + if(findTypes.length > 1){ + final String resourceType = findTypes[0]; + return nameWithouNamespacePrefix.substring(resourceType.length()); + } + return nameWithouNamespacePrefix; } private ImmutablePair createNodeTypeResourceFromYaml(final String yamlName,