summaryrefslogtreecommitdiffstats
path: root/openecomp-be
diff options
context:
space:
mode:
authorAvi Gaffa <avi.gaffa@amdocs.com>2017-10-17 06:22:05 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-17 06:22:05 +0000
commit93d9cc0a99f82a828a93012338f7eff3b271f7cb (patch)
treed4c84a9a7f371714e4cc2243e6eb51dcb50aeb13 /openecomp-be
parent4c1016f145c0595376361ac5b31e5fb478f561c6 (diff)
parent40b825923ae8cba4f4aafe09746513f585e423ea (diff)
Merge "Artifacts are not copied" into release-1.1.0
Diffstat (limited to 'openecomp-be')
-rw-r--r--openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java
index 69fa33aae7..f38d7f2b06 100644
--- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java
+++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java
@@ -345,7 +345,7 @@ public class ToscaConverterImpl implements ToscaConverter {
return CsarFileTypes.globalServiceTemplate;
} else if (isDefinitions(fileName)) {
return CsarFileTypes.definitionsFile;
- } else if (isMetadataFile(metadataFile)) {
+ } else if (isMetadataFile(fileName)) {
return CsarFileTypes.toscaMetadata;
}
return CsarFileTypes.externalFile;
@@ -409,7 +409,8 @@ public class ToscaConverterImpl implements ToscaConverter {
//todo - return error to user?
throw new CoreException(new ErrorCode.ErrorCodeBuilder()
.withCategory(ErrorCategory.APPLICATION)
- .withMessage("Can't create Node Type from " + nodeTypeId).build());
+ .withMessage("Can't create " + classToCreate.getSimpleName() + " from " +
+ nodeTypeId).build());
}
}