summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java5
-rw-r--r--ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java13
2 files changed, 3 insertions, 15 deletions
diff --git a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
index abd395bfb..1754957da 100644
--- a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
@@ -164,10 +164,9 @@ public class SdncFlatJsonDmaapConsumer extends SdncDmaapConsumer {
return(null);
}
- try {
- BufferedReader mapReader = new BufferedReader(new FileReader(mapFile));
+ try (BufferedReader mapReader = new BufferedReader(new FileReader(mapFile))) {
- String curLine = null;
+ String curLine;
while ((curLine = mapReader.readLine()) != null) {
curLine = curLine.trim();
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java
index 4c08949c0..dd9437ce9 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java
@@ -87,10 +87,7 @@ public class SdncArtifactMap {
if (mapFile.exists() && mapFile.canRead()) {
- BufferedReader rdr = null;
- try {
-
- rdr = new BufferedReader(new FileReader(mapFile));
+ try (BufferedReader rdr = new BufferedReader(new FileReader(mapFile))) {
for (String ln ; (ln = rdr.readLine()) != null ; ) {
String[] lnFields = ln.split(",");
@@ -107,14 +104,6 @@ public class SdncArtifactMap {
} catch (Exception e) {
LOG.error("Caught exception reading artifact map", e);
return;
- } finally {
- if (rdr != null) {
- try {
- rdr.close();
- } catch (IOException e) {
-
- }
- }
}
}
}