1 files changed, 13 insertions, 4 deletions

diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java b/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java
index bc12e55..ed53fc8 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java
@@ -913,6 +913,15 @@ public class CSARArchive implements AutoCloseable {
         }
     }
 
+
+    public String getProductName() {
+        if (this.toscaMeta.getMode().equals(Mode.WITH_TOSCA_META_DIR)) {
+            return this.manifest.getMetadata().getProductName();
+        } else {
+            return this.definition.getMetadata().getTemplateAuthor();
+        }
+    }
+
     public String getVendorName() {
         if (this.toscaMeta.getMode().equals(Mode.WITH_TOSCA_META_DIR)) {
             return this.toscaMeta.getCompanyName();
@@ -923,7 +932,7 @@ public class CSARArchive implements AutoCloseable {
 
     public String getVersion() {
         if (this.toscaMeta.getMode().equals(Mode.WITH_TOSCA_META_DIR)) {
-            return this.toscaMeta.getCsarVersion();
+            return this.manifest.getMetadata().getPackageVersion();
         } else {
             return this.definition.getMetadata().getTemplateVersion();
         }
@@ -945,7 +954,7 @@ public class CSARArchive implements AutoCloseable {
 
         int lineNo =0;
         List<String>lines = FileUtils.readLines(this.manifestMfFile);
-        //first hit the metadata section
+        //first hit the metadata: section
         for (String line: lines) {
             lineNo ++;
             line = line.trim();
@@ -963,13 +972,13 @@ public class CSARArchive implements AutoCloseable {
         if (lineNo < lines.size()) {
             for (int i = lineNo; i< lines.size(); i++) {
                 String line = lines.get(i).trim();
-                i ++;
 
-                if (line.startsWith("#")) {
+                if (line.startsWith("#") || line.isEmpty()) {
                     continue;
                 }
 
                 String[] tokens = line.split(":");
+                if (tokens.length < 2) continue;
                 String key = tokens[0];
                 String value = tokens[1];