From a6b9b0df565307fb66499f9862791f0d4fd4c68b Mon Sep 17 00:00:00 2001 From: rama-huawei Date: Tue, 19 Sep 2017 18:09:33 +0530 Subject: [PATCH] Fix for Sonar Blocker issues NullPointerException might be thrown DCAEGEN2-114 Change-Id: I79d82683e71a913d4446f07fe41af2be7174e92b Signed-off-by: rama-huawei --- .../java/com/att/nsa/dmaap/filemonitor/ServicePropertyService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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(); + 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()); -- 2.16.6