From 04303eda75af43247e64abf59f176ecb028b8da8 Mon Sep 17 00:00:00 2001
From: chris-lumigrow <cschaefer@lumigrow.com>
Date: Sat, 7 May 2016 15:21:40 -0700
Subject: [PATCH] changes order of m_properties assignment in Constructors such
 that the 'assignDefaults' data is NOT overwritten by the incoming values

---
 .../main/java/io/moquette/server/config/ClasspathConfig.java    | 2 +-
 .../main/java/io/moquette/server/config/FilesystemConfig.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/broker/src/main/java/io/moquette/server/config/ClasspathConfig.java b/broker/src/main/java/io/moquette/server/config/ClasspathConfig.java
index e0547d30..a9c54e1b 100644
--- a/broker/src/main/java/io/moquette/server/config/ClasspathConfig.java
+++ b/broker/src/main/java/io/moquette/server/config/ClasspathConfig.java
@@ -43,13 +43,13 @@ public class ClasspathConfig extends IConfig {
         }
         Reader configReader = new InputStreamReader(is);
         ConfigurationParser confParser = new ConfigurationParser();
+        m_properties = confParser.getProperties();
         assignDefaults();
         try {
             confParser.parse(configReader);
         } catch (ParseException pex) {
             LOG.warn("An error occurred in parsing configuration, fallback on default configuration", pex);
         }
-        m_properties = confParser.getProperties();
     }
 
     @Override
diff --git a/broker/src/main/java/io/moquette/server/config/FilesystemConfig.java b/broker/src/main/java/io/moquette/server/config/FilesystemConfig.java
index ffb0dcda..afe06c24 100644
--- a/broker/src/main/java/io/moquette/server/config/FilesystemConfig.java
+++ b/broker/src/main/java/io/moquette/server/config/FilesystemConfig.java
@@ -34,13 +34,13 @@ public class FilesystemConfig extends IConfig {
 
     public FilesystemConfig(File file) {
         ConfigurationParser confParser = new ConfigurationParser();
+        m_properties = confParser.getProperties();
         assignDefaults();
         try {
             confParser.parse(file);
         } catch (ParseException pex) {
             LOG.warn("An error occurred in parsing configuration, fallback on default configuration", pex);
         }
-        m_properties = confParser.getProperties();
     }
 
     public FilesystemConfig() {