From: rama-huawei <rama.subba.reddy.s@huawei.com>
Date: Tue, 19 Sep 2017 12:39:33 +0000 (+0530)
Subject: Fix for Sonar Blocker issues
X-Git-Tag: v1.0.1~39^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F13461%2F4;p=dmaap%2Fmessagerouter%2Fmessageservice.git

Fix for Sonar Blocker issues

NullPointerException might be thrown

DCAEGEN2-114

Change-Id: I79d82683e71a913d4446f07fe41af2be7174e92b
Signed-off-by: rama-huawei <rama.subba.reddy.s@huawei.com>
---

diff --git a/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertyService.java b/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertyService.java
index e4f4e03..9f9c862 100644
--- a/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertyService.java
+++ b/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertyService.java
@@ -90,7 +90,7 @@ public class ServicePropertyService {
 		FileInputStream fis = null;
 
 		if (fileList == null)
-			fileList = new ArrayList<File>();
+			fileList = new ArrayList<>();
 
 		// get all the files that are ".json" or ".properties", from a directory
 		// & it's sub-directories
@@ -110,7 +110,9 @@ public class ServicePropertyService {
 				} catch (Exception ioe) {
 					logger.error("Error reading the file stream ", ioe);
 				} finally {
-					fis.close();
+					if (fis != null) {
+						fis.close();
+					}
 				}
 			} else if (file.isDirectory()) {
 				getFileList(file.getPath());