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 (file)
--- 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());