Merge "Use try-with-resources"
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java
index 4e67bd1..6059a35 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfiguration.java
@@ -248,19 +248,11 @@
Map<String, String> properties = new HashMap<>();
Properties newProperties = new Properties();
- FileReader reader = null;
- try {
- reader = new FileReader(file);
+ try (FileReader reader = new FileReader(file)) {
newProperties.load(reader);
- } finally {
- if (reader != null) {
- try {
- reader.close();
- LOGGER.debug("Closed " + fileName);
- } catch (Exception e) {
- LOGGER.debug("Exception :",e);
- }
- }
+ }
+ catch (Exception e) {
+ LOGGER.debug("Exception :",e);
}
for (Entry<Object, Object> entry : newProperties.entrySet()) {
@@ -291,6 +283,7 @@
interrupt();
}
+ @Override
public void run() {
LOGGER.info(MessageEnum.BPMN_GENERAL_INFO, "BPMN",
"FileWatcherThread started");