From 81f26b4c1837c9f8ff49619782fe01d99f4f0683 Mon Sep 17 00:00:00 2001 From: "k.kazak" Date: Wed, 14 Aug 2019 10:18:31 +0200 Subject: Close input streams via try-with-resources DefaultDmaapPropertiesImpl: close FileInputStream after loading ServicePluginFactory: close HttpClient if processing fails close application.properties InputStream after loading remove redundant catch block if behavior is the same add logging of exception in finally block BpmnInstaller: close csarFile if processing fails Change-Id: Ic6f942c401277c5150c5cc1297aba27ccd40694c Coverity-scan: CID-203903, CID-211476, CID-211615, CID-219308 Issue-ID: SO-2211 Signed-off-by: k.kazak --- .../so/client/defaultproperties/DefaultDmaapPropertiesImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'common/src/main/java/org/onap') diff --git a/common/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java b/common/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java index 4ca5690188..8ef08057e6 100644 --- a/common/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java +++ b/common/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java @@ -35,11 +35,12 @@ public class DefaultDmaapPropertiesImpl implements DmaapProperties { public DefaultDmaapPropertiesImpl() throws IOException { File initialFile = new File("src/test/resources/dmaap.properties"); - InputStream targetStream = new FileInputStream(initialFile); Properties properties = new Properties(); - properties.load(targetStream); - this.properties = new HashMap<>(); - properties.forEach((key, value) -> this.properties.put((String) key, (String) value)); + try (InputStream targetStream = new FileInputStream(initialFile)) { + properties.load(targetStream); + this.properties = new HashMap<>(); + properties.forEach((key, value) -> this.properties.put((String) key, (String) value)); + } } @Override -- cgit 1.2.3-korg