From add9617a0796ce557d465536bbd1e11a52f4d6de Mon Sep 17 00:00:00 2001
From: bwssystems <info.bwssystems@gmail.com>
Date: Thu, 19 Nov 2020 12:09:13 -0600
Subject: [PATCH] Fix command line config path issue

When the command line config path is used and the ocnfig file has no entry for configfile a null pointer exception occurrs
---
 .gitignore                                                | 3 ++-
 src/main/java/com/bwssystems/HABridge/BridgeSettings.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f00330..2df1baa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,5 @@ sftp-config\.json
 # dependencies
 /node_modules
 
-package-lock.json
\ No newline at end of file
+package-lock.json
+.project
diff --git a/src/main/java/com/bwssystems/HABridge/BridgeSettings.java b/src/main/java/com/bwssystems/HABridge/BridgeSettings.java
index e12dc45..f2026a8 100644
--- a/src/main/java/com/bwssystems/HABridge/BridgeSettings.java
+++ b/src/main/java/com/bwssystems/HABridge/BridgeSettings.java
@@ -250,10 +250,10 @@ public class BridgeSettings extends BackupHandler {
 			return;
 		try {
 			theBridgeSettings = new Gson().fromJson(jsonContent, BridgeSettingsDescriptor.class);
+			theBridgeSettings.setConfigfile(aPath.toString());
 		} catch (Exception e) {
 			log.warn("Issue loading values from file: " + aPath.toUri().toString() + ", Gson convert failed.");
 			theBridgeSettings = new BridgeSettingsDescriptor();
-			theBridgeSettings.setConfigfile(aPath.toString());
 		}
     }