Merge "Fix Blocker and Critical Sonar issues/bugs."

[aai/aai-common.git] / aai-core / src / main / java / org / openecomp / aai / dmaap / AAIDmaapEventJMSConsumer.java

diff --git a/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSConsumer.java b/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSConsumer.java
index a30ebc0..8acb954 100644 (file)
--- a/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSConsumer.java
+++ b/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSConsumer.java
@@ -52,13 +52,11 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
 
        public AAIDmaapEventJMSConsumer() throws org.apache.commons.configuration.ConfigurationException {
                super();
-               try {
+               try(FileReader reader = new FileReader(new File(AAIConstants.AAI_EVENT_DMAAP_PROPS))) {
 
                        if (this.httpClient == null) {
-                               FileReader reader = new FileReader(new File(AAIConstants.AAI_EVENT_DMAAP_PROPS));
                                aaiEventProps = new Properties();
                                aaiEventProps.load(reader);
-                               reader.close();
 
                                String host = aaiEventProps.getProperty("host");
                                String topic = aaiEventProps.getProperty("topic");
@@ -70,6 +68,7 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
 
                } catch (IOException e) {
                        ErrorLogHelper.logError("AAI_4000", "Error updating dmaap config file for aai event.");
+                       LOGGER.error(e.getMessage(), e);
                }
 
        }