Merge "Fix the format of supplementary file and user params for aLaCarte requests"

[vid.git] / vid-app-common / src / main / java / org / onap / vid / services / CsvServiceImpl.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java
index 6ba1522..4aabdae 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java
@@ -1,3 +1,23 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.onap.vid.services;
 
 import com.opencsv.CSVReader;
@@ -177,7 +197,9 @@ public class CsvServiceImpl implements CsvService{
                     currentJson.put(new JSONObject().put(key, values));
                 } else {
                 JSONObject lastItem = lastItemInArray(currentJson);
-                    lastItem.put(key, values);
+                    if(lastItem != null) {
+                        lastItem.put(key, values);
+                    }
                 }
             }
         }