Merged msbg array fix.

Fixed #558 for null pointer on startup without habridge.conf
This commit is contained in:
bwssystems
2017-03-18 17:26:25 -05:00
parent 59ef6e88de
commit 1a402e425e
2 changed files with 8 additions and 5 deletions

View File

@@ -5,7 +5,7 @@
<groupId>com.bwssystems.HABridge</groupId> <groupId>com.bwssystems.HABridge</groupId>
<artifactId>ha-bridge</artifactId> <artifactId>ha-bridge</artifactId>
<version>4.3.0</version> <version>4.3.1</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>HA Bridge</name> <name>HA Bridge</name>

View File

@@ -435,11 +435,14 @@ public class BridgeSettingsDescriptor {
public void setupInternalTestUser() { public void setupInternalTestUser() {
boolean found = false; boolean found = false;
for (String key : whitelist.keySet()) { if(whitelist != null) {
if(key.equals(DEFAULT_INTERNAL_USER)) for (String key : whitelist.keySet()) {
found = true; if(key.equals(DEFAULT_INTERNAL_USER)) {
found = true;
break;
}
}
} }
if(!found) { if(!found) {
newWhitelistUser(DEFAULT_INTERNAL_USER, DEFAULT_USER_DESCRIPTION); newWhitelistUser(DEFAULT_INTERNAL_USER, DEFAULT_USER_DESCRIPTION);
} }