Merge "PNF TC R293901"

1 files changed, 7 insertions, 3 deletions

diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java
index d07884d..d879ff3 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java
@@ -42,14 +42,14 @@ public abstract class VTPValidateCSARBase extends OnapCommand {
         String path = (String) getParametersMap().get("csar").getValue();
 
         //execute
-        try {
-            CSARArchive csar = new CSARArchive();
+        try (CSARArchive csar = this.createArchiveInstance()){
             csar.init(path);
             csar.parse();
 
+            errors.addAll(csar.getErrors());
+
             this.validateCSAR(csar);
 
-            csar.cleanup();
         } catch (Exception e) {
             LOG.error(this.getVnfReqsNo() + ": Failed to validate CSAR" , e);
             throw new OnapCommandExecutionFailed(e.getMessage());
@@ -65,4 +65,8 @@ public abstract class VTPValidateCSARBase extends OnapCommand {
 
         this.getResult().setOutput(this.errors);
    }
+
+   protected CSARArchive createArchiveInstance(){
+        return new CSARArchive();
+   }
 }